Merge branch 'develop' into fb-LEAP-1292

Author: triklozoid

docs/source/guide/prompts_keys.md

@@ -113,3 +113,14 @@ To add a custom model, enter the following:
 * The endpoint URL for the model. For example, `https://my.openai.endpoint.com/v1`
 * An API key to access the model. An API key is tied to a specific account, but the access is shared within the org if added. (Optional)
 * An auth token to access the model API. An auth token provides API access at the server level. (Optional)
+
+### Example
+
+1. Setup [Ollama](https://ollama.com/), e.g. `ollama run llama3.2`
+2. [Verify your local OpenAI-compatible API is working](https://ollama.com/blog/openai-compatibility), e.g. `http://localhost:11434/v1`
+3. Create an externally facing endpoint, e.g. `https://my.openai.endpoint.com/v1` -> `http://localhost:11434/v1`
+4. Add connection to Label Studio:
+    - Name: `llama3.2` (must match the model name in Ollama)
+    - Endpoint: `https://my.openai.endpoint.com/v1` (note `v1` suffix is required)
+    - API key: `ollama` (default)
+    - Auth token: empty

label_studio/core/feature_flags/stale_feature_flags.py

@@ -6,7 +6,7 @@
     'fflag_fix_front_lsdv_4600_lead_time_27072023_short': False,
     'fflag_feat_front_lops_e_10_updated_ux_short': False,
     'fflag_fix_front_lsdv_4988_dynamic_no_label_120523_short': True,
-    'fflag_feat_back_lsdv_5035_use_created_at_from_draft_for_annotation_256052023_short': True,
+    'fflag_fix_back_lsdv_4648_annotator_filter_29052023_short': True,
     'ff_back_dev_4664_remove_storage_file_on_export_delete_29032023_short': False,
     'fflag_feat_front_lops_86_datasets_storage_edit_short': False,
     'fflag_fix_back_lsdv_4929_limit_exports_10042023_short': True,

label_studio/tasks/api.py

@@ -3,7 +3,6 @@
 import logging
 
 import drf_yasg.openapi as openapi
-from core.feature_flags import flag_set
 from core.mixins import GetParentObjectMixin
 from core.permissions import ViewClassPermission, all_permissions
 from core.utils.common import DjangoFilterDescriptionInspector
@@ -573,9 +572,7 @@ def perform_create(self, ser):
             if draft.task_id != task.id or not draft.has_permission(user) or draft.user_id != user.id:
                 raise PermissionDenied(f'You have no permission to draft id:{draft_id}')
 
-        if draft is not None and flag_set(
-            'fflag_feat_back_lsdv_5035_use_created_at_from_draft_for_annotation_256052023_short', user='auto'
-        ):
+        if draft is not None:
             # if the annotation will be created from draft - get created_at from draft to keep continuity of history
             extra_args['draft_created_at'] = draft.created_at
 

web/apps/labelstudio/src/pages/Organization/PeoplePage/@components/auth-token-settings/index.tsx

@@ -16,6 +16,7 @@ import { PeopleList } from "./PeopleList";
 import "./PeoplePage.scss";
 import { SelectedUser } from "./SelectedUser";
 import { TokenSettingsModal } from "@humansignal/core/blocks/TokenSettingsModal";
+import { useToast } from "@humansignal/ui";
 import { debounce } from "@humansignal/core/lib/utils/debounce";
 
 const InvitationModal = ({ link }) => {
@@ -51,7 +52,9 @@ const InvitationModal = ({ link }) => {
 export const PeoplePage = () => {
   const api = useAPI();
   const inviteModal = useRef();
+  const apiSettingsModal = useRef();
   const config = useConfig();
+  const toast = useToast();
   const [selectedUser, setSelectedUser] = useState(null);
 
   const [link, setLink] = useState();
@@ -121,13 +124,20 @@ export const PeoplePage = () => {
     () => ({
       title: "API Token Settings",
       style: { width: 480 },
-      body: () => <TokenSettingsModal />,
+      body: () => (
+        <TokenSettingsModal
+          onSaved={() => {
+            toast.show({ message: "API Token settings saved" });
+            apiSettingsModal.current?.close();
+          }}
+        />
+      ),
     }),
     [],
   );
 
   const showApiTokenSettingsModal = useCallback(() => {
-    inviteModal.current = modal(apiTokensSettingsModalProps);
+    apiSettingsModal.current = modal(apiTokensSettingsModalProps);
     __lsa("organization.token_settings");
   }, [inviteModalProps, link]);
 

web/apps/labelstudio/src/pages/Organization/PeoplePage/PeoplePage.jsx

@@ -1,6 +1,6 @@
 {
-  "message": "feat: OPTIC-1643: Copy Data Manager Quick View link to annotation or region (#7122)",
-  "commit": "b0783d85eb641cd7e5986ea12b085ff172473d27",
-  "date": "2025-02-26T13:45:32.000Z",
+  "message": "chore: LEAP-1293: Remove fflag_feat_back_lsdv_5035_use_created_at_fro… (#7135)",
+  "commit": "5a180200585ac61e43e3e9b3aa19ed5512783bfc",
+  "date": "2025-02-27T14:35:14.000Z",
   "branch": "develop"
 }

web/dist/apps/labelstudio/543.js

@@ -1,6 +1,6 @@
 {
-  "message": "feat: OPTIC-1643: Copy Data Manager Quick View link to annotation or region (#7122)",
-  "commit": "b0783d85eb641cd7e5986ea12b085ff172473d27",
-  "date": "2025-02-26T13:45:32.000Z",
+  "message": "chore: LEAP-1293: Remove fflag_feat_back_lsdv_5035_use_created_at_fro… (#7135)",
+  "commit": "5a180200585ac61e43e3e9b3aa19ed5512783bfc",
+  "date": "2025-02-27T14:35:14.000Z",
   "branch": "develop"
 }

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

@@ -1,6 +1,6 @@
 {
-  "message": "feat: OPTIC-1643: Copy Data Manager Quick View link to annotation or region (#7122)",
-  "commit": "b0783d85eb641cd7e5986ea12b085ff172473d27",
-  "date": "2025-02-26T13:45:32.000Z",
+  "message": "chore: LEAP-1293: Remove fflag_feat_back_lsdv_5035_use_created_at_fro… (#7135)",
+  "commit": "5a180200585ac61e43e3e9b3aa19ed5512783bfc",
+  "date": "2025-02-27T14:35:14.000Z",
   "branch": "develop"
 }

web/dist/apps/labelstudio/main.js

@@ -1,64 +1,84 @@
-import { Form, Input, Toggle } from "apps/labelstudio/src/components/Form";
 import { useAtomValue } from "jotai";
-import { formDataToJPO } from "@humansignal/core/lib/utils/helpers";
-import { saveSettingsAtom, settingsAtom } from "@humansignal/core/pages/AccountSettings/atoms";
+import { settingsAtom, TOKEN_SETTINGS_KEY } from "@humansignal/core/pages/AccountSettings/atoms";
+import { queryClientAtom } from "jotai-tanstack-query";
+
+import { Form, Input, Toggle } from "apps/labelstudio/src/components/Form";
+import { Button } from "apps/labelstudio/src/components/Button/Button";
 import type { AuthTokenSettings } from "@humansignal/core/pages/AccountSettings/types";
-import { useRef } from "react";
-import { debounce } from "@humansignal/core/lib/utils/debounce";
+import { type ChangeEvent, useState } from "react";
 
 export const TokenSettingsModal = ({
   showTTL,
+  onSaved,
 }: {
   showTTL?: boolean;
+  onSaved?: () => void;
 }) => {
   const settings = useAtomValue(settingsAtom);
-  const formRef = useRef<Form>();
-  const { mutate: saveSettings } = useAtomValue(saveSettingsAtom);
-  const onSubmit = debounce(() => {
-    const form = formRef.current.formElement.current as HTMLFormElement;
-    const data = formDataToJPO(new FormData(form));
-    const body = {
-      api_tokens_enabled: data.api_tokens_enabled === "on",
-      legacy_api_tokens_enabled: data.legacy_api_tokens_enabled === "on",
-    } satisfies Partial<AuthTokenSettings>;
-    saveSettings(body);
-  });
+  if (!settings.isSuccess || settings.isError || "error" in settings.data) {
+    return <div>Error loading settings.</div>;
+  }
   return (
-    <Form ref={formRef} onChange={onSubmit}>
+    <TokenSettingsModalView
+      key={settings.data?.api_tokens_enabled}
+      settings={settings.data}
+      showTTL={showTTL}
+      onSaved={onSaved}
+    />
+  );
+};
+
+function TokenSettingsModalView({
+  settings,
+  showTTL,
+  onSaved,
+}: { settings: AuthTokenSettings; showTTL?: boolean; onSaved?: () => void }) {
+  const [enableTTL, setEnableTTL] = useState(settings.api_tokens_enabled);
+  const queryClient = useAtomValue(queryClientAtom);
+  const reloadSettings = () => {
+    queryClient.invalidateQueries({ queryKey: [TOKEN_SETTINGS_KEY] });
+    onSaved?.();
+  };
+  return (
+    <Form action="accessTokenUpdateSettings" onSubmit={reloadSettings}>
       <Form.Row columnCount={1}>
         <Toggle
           label="Personal Access Tokens"
           name="api_tokens_enabled"
           description="Enable increased token authentication security"
-          checked={settings.data?.api_tokens_enabled ?? false}
+          checked={settings.api_tokens_enabled ?? false}
+          onChange={(e: ChangeEvent<HTMLInputElement>) => setEnableTTL(e.target.checked)}
         />
       </Form.Row>
       <Form.Row columnCount={1}>
         <Toggle
           label="Legacy Tokens"
           name="legacy_api_tokens_enabled"
           description="Enable legacy access tokens"
-          checked={settings.data?.legacy_api_tokens_enabled}
+          checked={settings.legacy_api_tokens_enabled ?? true}
         />
       </Form.Row>
       {showTTL === true && (
         <Form.Row columnCount={1}>
           <Input
-            name="time_to_live"
+            name="api_token_ttl_days"
             label="Personal Access Token Time-to-Live"
             description="The number of days, after creation, that the token will be valid for. After this time period a user will need to create a new access token"
             labelProps={{
               description:
                 "The number of days, after creation, that the token will be valid for. After this time period a user will need to create a new access token",
             }}
-            disabled={!settings.data?.api_tokens_enabled}
+            disabled={!enableTTL}
             type="number"
             min={10}
             max={365}
-            value={settings.data?.time_to_live ?? 30}
+            value={settings.api_token_ttl_days ?? 30}
           />
         </Form.Row>
       )}
+      <Form.Actions>
+        <Button type="submit">Save</Button>
+      </Form.Actions>
     </Form>
   );
-};
+}

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

@@ -0,0 +1,12 @@
+.success {
+  color: green;
+  display: flex;
+  gap: 8px;
+  align-items: center;
+  justify-content: center;
+}
+
+.success svg {
+  width: 16px;
+  height: 16px;
+}

web/dist/apps/labelstudio/vendor.js

@@ -1,61 +1,23 @@
 import { API } from "apps/labelstudio/src/providers/ApiProvider";
-import { atomWithMutation, atomWithQuery, queryClientAtom } from "jotai-tanstack-query";
+import { atomWithQuery } from "jotai-tanstack-query";
 
 type AuthTokenSettings = {
   api_tokens_enabled: boolean;
   legacy_api_tokens_enabled: boolean;
-  time_to_live: number;
+  api_token_ttl_days: number;
 };
 
 export const TOKEN_SETTINGS_KEY = "api-settings";
 
 export const settingsAtom = atomWithQuery(() => ({
   queryKey: [TOKEN_SETTINGS_KEY],
   async queryFn() {
-    const result = await API.invoke("accessTokenSettings");
+    const result = await API.invoke<AuthTokenSettings>("accessTokenSettings");
 
     if (!result.$meta.ok) {
       return { error: true };
     }
 
-    return result as AuthTokenSettings;
+    return result;
   },
 }));
-
-export const saveSettingsAtom = atomWithMutation((get) => {
-  const queryClient = get(queryClientAtom);
-  return {
-    mutationKey: ["api-settings-save"],
-    async mutationFn(settings: Partial<AuthTokenSettings>) {
-      const result = await API.invoke(
-        "accessTokenUpdateSettings",
-        {},
-        {
-          body: settings,
-        },
-      );
-
-      if (!result.$meta.ok) {
-        throw new Error(result.error);
-      }
-
-      return result as Partial<AuthTokenSettings>;
-    },
-    async onMutate(settings: Partial<AuthTokenSettings>) {
-      await queryClient.cancelQueries({ queryKey: [TOKEN_SETTINGS_KEY] });
-      const previousSettings = queryClient.getQueryData([TOKEN_SETTINGS_KEY]) as AuthTokenSettings;
-      queryClient.setQueryData(
-        [TOKEN_SETTINGS_KEY],
-        (old: AuthTokenSettings[]) => ({ ...previousSettings, ...settings }) as AuthTokenSettings,
-      );
-
-      return { previousSettings };
-    },
-    onError: (err, newTodo, context) => {
-      queryClient.setQueryData([TOKEN_SETTINGS_KEY], context?.previousSettings);
-    },
-    onSettled() {
-      queryClient.invalidateQueries({ queryKey: [TOKEN_SETTINGS_KEY] });
-    },
-  };
-});

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

@@ -1,5 +1,5 @@
 export type AuthTokenSettings = {
   api_tokens_enabled: boolean;
   legacy_api_tokens_enabled: boolean;
-  time_to_live: number;
+  api_token_ttl_days: number;
 };

web/dist/apps/labelstudio/version.json

@@ -1,5 +1,4 @@
 import type { APIAnnotation, APIPrediction, APITask, LSFAnnotation, LSFTaskData } from "../types/Task";
-import { FF_LSDV_5035, isFF } from "../utils/feature-flags";
 
 /**
  * Converts the task from the server format to the
@@ -30,7 +29,7 @@ export const taskToLSFormat = (task: APITask): LSFTaskData | void => {
 };
 
 export const annotationToLSF = (annotation: APIAnnotation) => {
-  const createdDate = isFF(FF_LSDV_5035) ? annotation.draft_created_at || annotation.created_at : annotation.created_at;
+  const createdDate = annotation.draft_created_at || annotation.created_at;
 
   return {
     ...annotation,

web/dist/libs/datamanager/version.json

@@ -42,11 +42,6 @@ export const FF_LSDV_4620_3_ML = "fflag_fix_front_lsdv_4620_memory_leaks_100723_
  */
 export const FF_LSDV_4711 = "fflag_fix_all_lsdv_4711_cors_errors_accessing_task_data_short";
 
-/**
- * Allow the ability to filter annotations by their original created_at timestamp
- */
-export const FF_LSDV_5035 = "fflag_feat_back_lsdv_5035_use_created_at_from_draft_for_annotation_256052023_short";
-
 /**
  * Updated UX with improved accessibility
  */