Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Copy changes #5696

Closed
wants to merge 6 commits into from
Closed

fix: Copy changes #5696

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7e307a0
changing the copy back and providing more info
Apr 9, 2024
d87528e
changing the copy
Apr 9, 2024
54faef5
fixing structure
Apr 9, 2024
c427a7a
ci: Build frontend
robot-ci-heartex Apr 9, 2024
bc87eb8
Update web/apps/labelstudio/src/components/Description/Description.styl
deppp Apr 9, 2024
6e7c654
ci: Build frontend
robot-ci-heartex Apr 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions web/apps/labelstudio/src/components/Description/Description.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,10 @@

&_large
margin 40px 0

&_alert
&_warning
background-color rgb(255, 251, 230);
border 1px solid rgb(255, 229, 143);
border-radius 8px
padding 10px
deppp marked this conversation as resolved.
Show resolved Hide resolved
16 changes: 3 additions & 13 deletions web/apps/labelstudio/src/pages/Settings/AnnotationSettings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,23 +57,13 @@ export const AnnotationSettings = () => {

<Form.Row columnCount={1} style={{ borderTop: '1px solid #f1f1f1' }}>
<br />
<Elem name={'header'}>Live Predictions</Elem>
<Elem name={'header'}>Prelabeling</Elem>
<div>
<Toggle
label="Use predictions to pre-label tasks"
label="Use predictions to prelabel tasks"
description={
<span>
Enable and select which set of predictions to use for prelabeling.
Predictions will be pre-loaded in {" "}
<a
style={{ color: "rgb(105 129 185)" }}
target="_blank" href="https://labelstud.io/guide/labeling.html#Choose-which-tasks-to-label"
>Label&nbsp;All&nbsp;Tasks</a>{" "}
and {" "}
<a
style={{ color: "rgb(105 129 185)" }}
target="_blank" href="https://labelstud.io/guide/get_started#Interface"
>Quick View</a>.
Comment on lines -67 to -76
Copy link
Collaborator

@hlomzik hlomzik Apr 9, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like a helpful info given the diversity of affected workflows (and I believe some were missing here anyway, like action in DM to convert predictions into annotations?) + links to documentation.
Can we maybe rephrase this without removal? Why is it better to not have this info at all?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The state of those linked docs is not great, and it would create more confusion that explain much. We first need to improve those sections, before we include it into the product. Overall, its simplicity.

Enable and select which set of predictions to use for prelabeling.
</span>
}
name="show_collab_predictions"
Expand Down
6 changes: 3 additions & 3 deletions web/apps/labelstudio/src/pages/Settings/MachineLearningSettings/MachineLearningList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,11 @@ const BackendCard = ({
<div className={rootClass.elem("menu")}>
<Dropdown.Trigger align="right" content={(
<Menu size="medium" contextual>
<Menu.Item onClick={() => onEdit(backend)}>Edit</Menu.Item>
<Menu.Item onClick={() => confirmDelete(backend)} isDangerous>Delete</Menu.Item>
<Menu.Divider />
<Menu.Item onClick={() => onEdit(backend)}>Edit</Menu.Item>
<Menu.Item onClick={() => onTestRequest(backend)}>Send Test Request</Menu.Item>
<Menu.Item onClick={() => onStartTrain(backend)}>Start Training</Menu.Item>
<Menu.Divider />
<Menu.Item onClick={() => confirmDelete(backend)} isDangerous>Delete</Menu.Item>
</Menu>
)}>
<Button type="link" icon={<LsEllipsis />} style={{ padding: "15px" }} />
Expand Down
1 change: 0 additions & 1 deletion web/apps/labelstudio/src/pages/Settings/MachineLearningSettings/MachineLearningList.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@

&__title-container
display flex
align-items center
justify-content space-between
gap 5px

Expand Down
42 changes: 17 additions & 25 deletions web/apps/labelstudio/src/pages/Settings/MachineLearningSettings/MachineLearningSettings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { Divider } from '../../../components/Divider/Divider';
import { Form, Label, Toggle } from '../../../components/Form';
import { modal } from '../../../components/Modal/Modal';
import { EmptyState } from '../../../components/EmptyState/EmptyState';
import { IconEmptyPredictions } from '../../../assets/icons';
import { IconEmptyPredictions, IconInfo } from '../../../assets/icons';
import { useAPI } from '../../../providers/ApiProvider';
import { ProjectContext } from '../../../providers/ProjectProvider';
import { MachineLearningList } from './MachineLearningList';
Expand Down Expand Up @@ -135,30 +135,22 @@ export const MachineLearningSettings = () => {
<Divider height={32} />

{backends.length > 0 && (
<Description style={{ marginTop: 0, maxWidth: 680, lineHeight: "1.5em" }}>
A connected model has been detected! If you wish to fetch
predictions from this model, please follow these steps:
<br />
<br />
1. Navigate to the <i>Data Manager</i>.<br />
2. Select the desired tasks.<br />
3. Click on <i>Batch predictions</i> from the{' '}
<i>Actions</i> menu.
<br />
<br />
Additionally, you can configure the system to use this model for
fetching live predictions in {" "}
<a
style={{ color: "unset", textDecoration: "underline" }}
target="_blank" href="https://labelstud.io/guide/labeling.html#Choose-which-tasks-to-label"
><i>Label&nbsp;All&nbsp;Tasks</i></a>{" "}
and{" "}
<a
style={{ color: "unset", textDecoration: "underline" }}
target="_blank" href="https://labelstud.io/guide/get_started#Interface"
><i>Quick View</i></a>{" "}
on the <i>Annotation</i> tab.
</Description>
<>
<Description style={{ marginTop: 0, maxWidth: 680, lineHeight: "1.5em" }}>
A connected model has been detected! If you wish to fetch
predictions from this model, please follow these steps:
<br />
<br />
1. Navigate to the <i>Data Manager</i>.<br />
2. Select the desired tasks.<br />
3. Click on <i>Retrieve predictions</i> from the{' '}
<i>Actions</i> menu.
</Description>
<Description style={{ marginTop: 0, display: "flex", gap: "5px" }} className="description_alert_warning">
<IconInfo width="20" height="20" />
If you want to use the model predictions for prelabeling, please configure this in the Annotation settings.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Link to Annotation settings would be helpful as we discussed

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I'm very supportive if you can implement that :)

</Description>
</>
)}

<Form
Expand Down
2 changes: 1 addition & 1 deletion web/dist/apps/labelstudio/main.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion web/dist/apps/labelstudio/main.css.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion web/dist/apps/labelstudio/main.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion web/dist/apps/labelstudio/main.js.map
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions web/dist/apps/labelstudio/version.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"message": "Merge branch 'develop' into 'fb-HUMSIG-37-visuals'",
"commit": "309851f803a1995c36b11f416f80cff709b6be2f",
"date": "2024-04-04T16:34:09.000Z",
"branch": "fb-HUMSIG-37-visuals"
"message": "fixing structure",
"commit": "54faef5f70ba1019dc9804f556494c15d4209cd0",
"date": "2024-04-09T03:42:09.000Z",
"branch": "dev/copy-changes"
}
8 changes: 4 additions & 4 deletions web/dist/libs/datamanager/version.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"message": "Merge branch 'develop' into 'fb-HUMSIG-37-visuals'",
"commit": "309851f803a1995c36b11f416f80cff709b6be2f",
"date": "2024-04-04T16:34:09.000Z",
"branch": "fb-HUMSIG-37-visuals"
"message": "fixing structure",
"commit": "54faef5f70ba1019dc9804f556494c15d4209cd0",
"date": "2024-04-09T03:42:09.000Z",
"branch": "dev/copy-changes"
}
8 changes: 4 additions & 4 deletions web/dist/libs/editor/version.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"message": "Merge branch 'develop' into 'fb-HUMSIG-37-visuals'",
"commit": "309851f803a1995c36b11f416f80cff709b6be2f",
"date": "2024-04-04T16:34:09.000Z",
"branch": "fb-HUMSIG-37-visuals"
"message": "fixing structure",
"commit": "54faef5f70ba1019dc9804f556494c15d4209cd0",
"date": "2024-04-09T03:42:09.000Z",
"branch": "dev/copy-changes"
}