Skip to content

Commit 01b798f

Browse files
GondragosGondragos
committed
Merge branch 'develop' into 'fb-LEAP-1957/view-all-tests'
Workflow run: https://github.com/HumanSignal/label-studio/actions/runs/14748621628
2 parents 9f563b1 + 97db9e7 commit 01b798f

File tree

358 files changed

+5143
-3887
lines changed

Some content is hidden

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

358 files changed

+5143
-3887
lines changed

‎.github/workflows/docker-build-ontop.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ jobs:
110110
${{ steps.calculate-docker-tags.outputs.docker-tags }}
111111
112112
- name: Push Docker image
113-
uses: docker/build-push-action@v6.15.0
113+
uses: docker/build-push-action@v6.16.0
114114
id: docker_build_and_push
115115
with:
116116
context: .

‎.github/workflows/docker-build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ jobs:
130130
type=raw,value=${{ steps.version.outputs.build_version }}
131131
132132
- name: Push Docker image
133-
uses: docker/build-push-action@v6.15.0
133+
uses: docker/build-push-action@v6.16.0
134134
id: docker_build_and_push
135135
with:
136136
context: .

‎.github/workflows/docker-release-promote.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ jobs:
195195
${{ steps.generate-tags.outputs.ubuntu-tags }}
196196
197197
- name: Build and Push Release Ubuntu Docker image
198-
uses: docker/build-push-action@v6.15.0
198+
uses: docker/build-push-action@v6.16.0
199199
id: docker_build
200200
with:
201201
context: ${{ steps.release_dockerfile.outputs.release_dir }}

‎docs/source/guide/export.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ Export your brush mask labels as NumPy 2d arrays and PNG images. Each label outp
121121

122122
### COCO
123123

124-
A popular machine learning format used by the [COCO dataset](http://cocodataset.org/#home) for object detection and image segmentation tasks. Supports bounding box and polygon image labeling projects that use the `RectangleLabels` or `PolygonLabels` tags.
124+
A popular machine learning format used by the [COCO dataset](http://cocodataset.org/#home) for object detection and image segmentation tasks. Supports bounding box and polygon image labeling projects that use the `BrushLabels`, `RectangleLabels`, or `PolygonLabels` tags.
125125

126126
### CoNLL2003
127127

‎docs/source/guide/prompts_overview.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ With Prompts, you can:
4848

4949
| Provider | Supported models |
5050
| --- | --- |
51-
| **OpenAI** | gpt-3.5-turbo-16k* <br>gpt-3.5-turbo* <br>gpt-4 <br>gpt-4-turbo <br>gpt-4o <br>gpt-4o-mini <br>o3-mini <br>o1<br><br>**Note:** We recommend against using GPT 3.5 models, as these can sometimes be prone to rate limit errors and are not compatible with Image data. |
52-
| **Gemini** | gemini-2.0-flash-exp <br>gemini-1.5-flash <br>gemini-1.5-flash-8b <br>gemini-1.5-pro |
53-
| **Vertex AI** | gemini-2.0-flash-exp <br>gemini-1.5-flash <br>gemini-1.5-pro |
54-
| **Anthropic** | claude-3-5-haiku <br>claude-3-5-sonnet |
51+
| **OpenAI** | gpt-4 <br>gpt-4-turbo <br>gpt-4o <br>gpt-4o-mini <br>gpt-4.5-preview <br>o3-mini <br>o1 |
52+
| **Gemini** | gemini-2.5-pro-preview-03-25 <br>gemini-2.0-flash <br>gemini-2.0-flash-lite <br>gemini-1.5-flash <br>gemini-1.5-flash-8b <br>gemini-1.5-pro |
53+
| **Vertex AI** | gemini-2.5-pro-preview-03-25 <br>gemini-2.0-flash <br>gemini-2.0-flash-lite <br>gemini-1.5-flash <br>gemini-1.5-pro |
54+
| **Anthropic** | claude-3-5-haiku-latest <br>claude-3-5-sonnet-latest <br>claude-3-7-sonnet-latest |
5555
| **Azure OpenAI** | [Azure OpenAI chat-based models](https://learn.microsoft.com/en-us/azure/ai-services/openai/concepts/models) <br><br>**Note:** We recommend against using GPT 3.5 models, as these can sometimes be prone to rate limit errors and are not compatible with Image data. |
5656
| **Azure AI Foundry** | We support all Azure AI Foundry models. |
5757
| **Custom** | [Custom LLM](prompts_create#Add-OpenAI-Azure-OpenAI-or-a-custom-model) |

‎docs/themes/v2/source/css/codemirror.css

+17-17
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
/* GUTTER */
2626

2727
.CodeMirror-gutters {
28-
border-right: 1px solid #ddd;
29-
background-color: #f7f7f7;
28+
border-right: 1px solid var(--color-neutral-border);
29+
background-color: var(--color-neutral-surface);
3030
white-space: nowrap;
3131
}
3232
.CodeMirror-linenumbers {
@@ -43,13 +43,13 @@
4343
color: black;
4444
}
4545
.CodeMirror-guttermarker-subtle {
46-
color: #999;
46+
color: var(--color-neutral-content-subtlest);
4747
}
4848

4949
/* CURSOR */
5050

5151
.CodeMirror-cursor {
52-
border-left: 1px solid black;
52+
border-left: 1px solid var(--color-neutral-inverted-content);
5353
border-right: none;
5454
width: 0;
5555
}
@@ -134,16 +134,16 @@
134134
/* DEFAULT THEME */
135135

136136
.cm-s-default .cm-header {
137-
color: #617ADA;
137+
color: var(--color-accent-grape-bold);
138138
}
139139
.cm-s-default .cm-quote {
140-
color: #34988D;
140+
color: var(--color-accent-kale-bold);
141141
}
142142
.cm-negative {
143-
color: #E6694E;
143+
color: var(--color-negative-content);
144144
}
145145
.cm-positive {
146-
color: #34988D;
146+
color: var(--color-positive-content);
147147
}
148148
.cm-header,
149149
.cm-strong {
@@ -181,16 +181,16 @@
181181
}
182182
.cm-s-default .cm-variable-3,
183183
.cm-s-default .cm-type {
184-
color: #34988D;
184+
color: var(--color-accent-kale-bold);
185185
}
186186
.cm-s-default .cm-comment {
187-
color: #E69559;
187+
color: var(--color-accent-canteloupe-bold);
188188
}
189189
.cm-s-default .cm-string {
190-
color: #CC6FBE;
190+
color: var(--color-accent-plum-bold);
191191
}
192192
.cm-s-default .cm-string-2 {
193-
color: #E6694E;
193+
color: var(--color-accent-persimmon-bold);
194194
}
195195
.cm-s-default .cm-meta {
196196
color: #6B6860;
@@ -218,10 +218,10 @@
218218
}
219219

220220
.cm-s-default .cm-error {
221-
color: #E6694E;
221+
color: var(--color-negative-content);
222222
}
223223
.cm-invalidchar {
224-
color: #E6694E;
224+
color: var(--color-negative-content);
225225
}
226226

227227
.CodeMirror-composing {
@@ -231,10 +231,10 @@
231231
/* Default styles for common addons */
232232

233233
div.CodeMirror span.CodeMirror-matchingbracket {
234-
color: #0b0;
234+
color: var(--color-positive-content);
235235
}
236236
div.CodeMirror span.CodeMirror-nonmatchingbracket {
237-
color: #a22;
237+
color: var(--color-negative-content);
238238
}
239239
.CodeMirror-matchingtag {
240240
background: rgba(255, 150, 0, 0.3);
@@ -251,7 +251,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {
251251
.CodeMirror {
252252
position: relative;
253253
overflow: hidden;
254-
background: white;
254+
background: var(--color-neutral-background);
255255
}
256256

257257
.CodeMirror-scroll {

‎label_studio/core/all_urls.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -131,12 +131,6 @@
131131
"name": "projects:project-settings-anything",
132132
"decorators": ""
133133
},
134-
{
135-
"url": "/projects/upload-example/",
136-
"module": "projects.views.upload_example_using_config",
137-
"name": "projects:project-upload-example-using-config",
138-
"decorators": ""
139-
},
140134
{
141135
"url": "/api/projects/",
142136
"module": "projects.api.ProjectListAPI",
@@ -1936,5 +1930,11 @@
19361930
"module": "jwt_auth.views.LSTokenBlacklistView",
19371931
"name": "jwt_auth:token_blacklist",
19381932
"decorators": ""
1933+
},
1934+
{
1935+
"url": "/api/token/rotate/",
1936+
"module": "jwt_auth.views.LSAPITokenRotateView",
1937+
"name": "jwt_auth:token_rotate",
1938+
"decorators": ""
19391939
}
19401940
]

‎label_studio/core/static/css/error.css

+35-8
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,44 @@
1-
/* Compiled from App.styl */
21
.ls-global-error {
32
display: flex;
43
flex-direction: column;
54
align-items: center;
65
padding-top: 15vh;
76
}
7+
8+
.ls-global-error__header {
9+
position: relative;
10+
width: 812px;
11+
}
12+
13+
.ls-global-error__code {
14+
font-size: 380px;
15+
font-weight: 700;
16+
color: var(--color-neutral-content);
17+
user-select: none;
18+
-webkit-user-select: none;
19+
line-height: 1em;
20+
text-align: center;
21+
}
22+
823
.ls-global-error__heidi {
924
width: 812px;
25+
position: absolute;
26+
top: -22px;
27+
left: -22px;
28+
height: 100%;
29+
user-select: none;
30+
-webkit-user-select: none;
1031
}
1132

1233
.ls-global-error h1 {
1334
font-size: 48px;
35+
color: var(--color-neutral-content);
1436
}
1537

1638
.ls-global-error h2 {
1739
font-size: 16px;
40+
color: var(--color-neutral-content);
41+
font-weight: 500;
1842
}
1943

2044
.ls-global-error__actions {
@@ -34,25 +58,28 @@ body > .ls-global-error .button {
3458
cursor: pointer;
3559
padding: 0 16px;
3660
display: inline-flex;
37-
background-color: #fff;
61+
background-color: var(--color-neutral-background);
3862
align-items: center;
3963
border-radius: 5px;
4064
text-align: center;
4165
text-decoration: none;
4266
justify-content: center;
43-
color: #333;
44-
box-shadow: inset 0px -1px 0px rgba(0,0,0,0.1), inset 0px 0px 0px 1px rgba(0,0,0,0.15);
67+
color: var(--color-neutral-content);
68+
border: 1px solid var(--color-neutral-border);
4569
font-weight: 500;
70+
transition: all 150ms ease-out;
4671
}
4772

4873
body > .ls-global-error button:hover {
49-
box-shadow: rgba(0, 0, 0, 0.05) 0px 2px 4px 0px, rgba(0, 0, 0, 0.1) 0px -1px 0px 0px inset, rgba(0, 0, 0, 0.2) 0px 0px 0px 1px inset;
74+
border-color: var(--color-neutral-border-bold);
5075
}
5176

5277
body > .ls-global-error button.ls-global-error__primary_button {
53-
background-color: #566fcf;
54-
color: #fff;
78+
background-color: var(--color-primary-surface);
79+
color: var(--color-primary-surface-content);
80+
transition: all 150ms ease-out;
5581
}
82+
5683
body > .ls-global-error button.ls-global-error__primary_button:hover {
57-
background-color: #4C5FA9;
84+
background-color: var(--color-primary-surface-hover);
5885
}

0 commit comments

Comments
 (0)