feat: Add Current Datetime to Assistants (v1/v2) (#4952)

* Feature: Added ability to send current date and time to v1 and v2 assistants

* remove date_feature.patch

* fix: rename append_today_date to append_current_datetime

* feat: Refactor time handling in chatV1 and chatV2, add date and time utility functions

* fix: Add warning log and response for missing run values in abortRun middleware

---------

Co-authored-by: Max Sanna <max@maxsanna.com>
This commit is contained in:
Danny Avila 2024-12-11 15:26:18 -05:00 committed by GitHub
parent b5c9144127
commit 1dbe6ee75d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
38 changed files with 378 additions and 67 deletions

View file

@ -27,4 +27,5 @@ export type AssistantForm = {
conversation_starters: string[];
model: string;
functions: string[];
append_current_datetime: boolean;
} & Actions;

View file

@ -278,6 +278,7 @@ export type TAskProps = {
parentMessageId?: string | null;
conversationId?: string | null;
messageId?: string | null;
clientTimestamp?: string;
};
export type TOptions = {

View file

@ -0,0 +1,76 @@
import { Control, Controller, UseFormSetValue, UseFormGetValues } from 'react-hook-form';
import { CircleHelpIcon } from '~/components/svg';
import { useLocalize } from '~/hooks';
import {
HoverCard,
HoverCardContent,
HoverCardPortal,
HoverCardTrigger,
Checkbox,
} from '~/components/ui';
import { ESide } from '~/common';
import type { AssistantForm } from '~/common';
interface AppendDateCheckboxProps {
control: Control<AssistantForm>;
setValue: UseFormSetValue<AssistantForm>;
getValues: UseFormGetValues<AssistantForm>;
}
export default function AppendDateCheckbox({ control, setValue }: AppendDateCheckboxProps) {
const localize = useLocalize();
const handleChange = (checked: boolean) => {
setValue('append_current_datetime', checked, {
shouldDirty: true,
});
};
return (
<div className="mb-6">
<HoverCard openDelay={50}>
<div className="flex items-center">
<Controller
name="append_current_datetime"
control={control}
render={({ field }) => (
<Checkbox
{...field}
id="append_current_datetime"
checked={field.value}
onCheckedChange={handleChange}
className="relative float-left mr-2 inline-flex h-4 w-4 cursor-pointer"
value={field.value.toString()}
aria-labelledby="append-date-label"
/>
)}
/>
<div className="flex items-center space-x-2">
<label
id="append-date-label"
htmlFor="append_current_datetime"
className="form-check-label text-token-text-primary w-full cursor-pointer"
>
{localize('com_assistants_append_date')}
</label>
<HoverCardTrigger>
<CircleHelpIcon
className="h-5 w-5 text-gray-500"
aria-label={localize('com_assistants_append_date_tooltip')}
/>
</HoverCardTrigger>
</div>
<HoverCardPortal>
<HoverCardContent side={ESide.Top} className="w-80">
<div className="space-y-2">
<p className="text-sm text-gray-600 dark:text-gray-300">
{localize('com_assistants_append_date_tooltip')}
</p>
</div>
</HoverCardContent>
</HoverCardPortal>
</div>
</HoverCard>
</div>
);
}

View file

@ -19,6 +19,7 @@ import { useAssistantsMapContext, useToastContext } from '~/Providers';
import { useSelectAssistant, useLocalize } from '~/hooks';
import { ToolSelectDialog } from '~/components/Tools';
import CapabilitiesForm from './CapabilitiesForm';
import AppendDateCheckbox from './AppendDateCheckbox';
import { SelectDropDown } from '~/components/ui';
import AssistantAvatar from './AssistantAvatar';
import AssistantSelect from './AssistantSelect';
@ -63,7 +64,7 @@ export default function AssistantPanel({
const [showToolDialog, setShowToolDialog] = useState(false);
const { control, handleSubmit, reset } = methods;
const { control, handleSubmit, reset, setValue, getValues } = methods;
const assistant = useWatch({ control, name: 'assistant' });
const functions = useWatch({ control, name: 'functions' });
const assistant_id = useWatch({ control, name: 'id' });
@ -167,7 +168,7 @@ export default function AssistantPanel({
instructions,
conversation_starters: starters,
model,
// file_ids, // TODO: add file handling here
append_current_datetime,
} = data;
if (assistant_id) {
@ -181,6 +182,7 @@ export default function AssistantPanel({
model,
tools,
endpoint,
append_current_datetime,
},
});
return;
@ -195,6 +197,7 @@ export default function AssistantPanel({
tools,
endpoint,
version,
append_current_datetime,
});
};
@ -325,6 +328,9 @@ export default function AssistantPanel({
/>
</div>
{/* Append Today's Date */}
<AppendDateCheckbox control={control} setValue={setValue} getValues={getValues} />
{/* Conversation Starters */}
<div className="relative mb-6">
{/* the label of conversation starters is in the component */}

View file

@ -1,5 +1,5 @@
import { Plus } from 'lucide-react';
import { useCallback, useEffect, useRef, useMemo } from 'react';
import { useCallback, useEffect, useRef } from 'react';
import {
Tools,
FileSources,
@ -37,6 +37,7 @@ const keys = new Set([
'instructions',
'conversation_starters',
'model',
'append_current_datetime',
]);
export default function AssistantSelect({
@ -69,7 +70,7 @@ export default function AssistantSelect({
res.data.map((_assistant) => {
const source =
endpoint === EModelEndpoint.assistants ? FileSources.openai : FileSources.azure;
const assistant = {
const assistant: TAssistantOption = {
..._assistant,
label: _assistant.name ?? '',
value: _assistant.id,
@ -125,8 +126,11 @@ export default function AssistantSelect({
const assistantDoc = documentsMap?.get(_assistant.id);
/* If no user updates, use the latest assistant docs */
if (assistantDoc && !assistant.conversation_starters) {
assistant.conversation_starters = assistantDoc.conversation_starters;
if (assistantDoc) {
if (!assistant.conversation_starters) {
assistant.conversation_starters = assistantDoc.conversation_starters;
}
assistant.append_current_datetime = assistantDoc.append_current_datetime ?? false;
}
return assistant;
@ -184,6 +188,11 @@ export default function AssistantSelect({
return;
}
if (name === 'append_current_datetime') {
formValues[name] = !!value;
return;
}
if (
name === 'conversation_starters' &&
Array.isArray(value) &&

View file

@ -258,6 +258,8 @@ export const useCreateSharedLinkMutation = (
return;
}
const isPublic = vars.isPublic === true;
queryClient.setQueryData<t.SharedLinkListData>([QueryKeys.sharedLinks], (sharedLink) => {
if (!sharedLink) {
return sharedLink;
@ -265,24 +267,22 @@ export const useCreateSharedLinkMutation = (
const pageSize = sharedLink.pages[0].pageSize as number;
return normalizeData(
// If the shared link is public, add it to the shared links cache list
vars.isPublic
? addSharedLink(sharedLink, _data)
: deleteSharedLink(sharedLink, _data.shareId),
isPublic ? addSharedLink(sharedLink, _data) : deleteSharedLink(sharedLink, _data.shareId),
InfiniteCollections.SHARED_LINKS,
pageSize,
);
});
queryClient.setQueryData([QueryKeys.sharedLinks, _data.shareId], _data);
if (!vars.isPublic) {
if (!isPublic) {
const current = queryClient.getQueryData<t.ConversationData>([QueryKeys.sharedLinks]);
refetch({
refetchPage: (page, index) => index === (current?.pages.length || 1) - 1,
refetchPage: (page, index) => index === ((current?.pages.length ?? 0) || 1) - 1,
});
}
onSuccess?.(_data, vars, context);
},
...(_options || {}),
..._options,
});
};
@ -298,6 +298,8 @@ export const useUpdateSharedLinkMutation = (
return;
}
const isPublic = vars.isPublic === true;
queryClient.setQueryData<t.SharedLinkListData>([QueryKeys.sharedLinks], (sharedLink) => {
if (!sharedLink) {
return sharedLink;
@ -305,7 +307,7 @@ export const useUpdateSharedLinkMutation = (
return normalizeData(
// If the shared link is public, add it to the shared links cache list.
vars.isPublic
isPublic
? // Even if the SharedLink data exists in the database, it is not registered in the cache when isPublic is false.
// Therefore, when isPublic is true, use addSharedLink instead of updateSharedLink.
addSharedLink(sharedLink, _data)
@ -316,16 +318,16 @@ export const useUpdateSharedLinkMutation = (
});
queryClient.setQueryData([QueryKeys.sharedLinks, _data.shareId], _data);
if (!vars.isPublic) {
if (!isPublic) {
const current = queryClient.getQueryData<t.ConversationData>([QueryKeys.sharedLinks]);
refetch({
refetchPage: (page, index) => index === (current?.pages.length || 1) - 1,
refetchPage: (page, index) => index === ((current?.pages.length ?? 0) || 1) - 1,
});
}
onSuccess?.(_data, vars, context);
},
...(_options || {}),
..._options,
});
};
@ -466,7 +468,11 @@ export const useDeleteTagInConversations = () => {
for (let pageIndex = 0; pageIndex < newData.pages.length; pageIndex++) {
const page = newData.pages[pageIndex];
page.conversations = page.conversations.map((conversation) => {
if (conversation.conversationId && conversation.tags?.includes(deletedTag)) {
if (
conversation.conversationId != null &&
conversation.conversationId &&
conversation.tags?.includes(deletedTag) === true
) {
conversationIdsWithTag.push(conversation.conversationId);
conversation.tags = conversation.tags.filter((t) => t !== deletedTag);
}
@ -833,11 +839,12 @@ export const useUpdateAssistantMutation = (
if (!prev) {
return prev;
}
prev.map((doc) => {
return prev.map((doc) => {
if (doc.assistant_id === variables.assistant_id) {
return {
...doc,
conversation_starters: updatedAssistant.conversation_starters,
append_current_datetime: variables.data.append_current_datetime,
};
}
return doc;
@ -976,7 +983,9 @@ export const useUpdateAction = (
}
return action;
})
.concat(variables.action_id ? [] : [updateActionResponse[2]]);
.concat(
variables.action_id != null && variables.action_id ? [] : [updateActionResponse[2]],
);
});
return options?.onSuccess?.(updateActionResponse, variables, context);
@ -1032,7 +1041,7 @@ export const useDeleteAction = (
return {
...assistant,
tools: (assistant.tools ?? []).filter(
(tool) => !tool.function?.name.includes(domain ?? ''),
(tool) => !(tool.function?.name.includes(domain ?? '') ?? false),
),
};
}
@ -1230,7 +1239,11 @@ export const useUpdateAgentAction = (
}
return action;
})
.concat(variables.action_id ? [] : [updateAgentActionResponse[1]]);
.concat(
variables.action_id != null && variables.action_id
? []
: [updateAgentActionResponse[1]],
);
});
return options?.onSuccess?.(updateAgentActionResponse, variables, context);

View file

@ -176,6 +176,7 @@ export default function useChatFunctions({
const currentMsg: TMessage = {
text,
sender: 'User',
clientTimestamp: new Date().toLocaleString('sv').replace(' ', 'T'),
isCreatedByUser: true,
parentMessageId,
conversationId,

View file

@ -45,17 +45,22 @@ export default function useSubmitMessage(helpers?: { clearDraft?: () => void })
const overrideConvoId = isNewMultiConvo ? v4() : undefined;
const overrideUserMessageId = hasAdded ? v4() : undefined;
const rootIndex = addedIndex - 1;
const clientTimestamp = new Date().toISOString();
ask({
text: data.text,
overrideConvoId: appendIndex(rootIndex, overrideConvoId),
overrideUserMessageId: appendIndex(rootIndex, overrideUserMessageId),
clientTimestamp,
});
if (hasAdded) {
askAdditional(
{
text: data.text,
overrideConvoId: appendIndex(addedIndex, overrideConvoId),
overrideUserMessageId: appendIndex(addedIndex, overrideUserMessageId),
clientTimestamp,
},
{ overrideMessages: rootMessages },
);

View file

@ -372,6 +372,9 @@ export default {
com_assistants_knowledge_disabled:
'يجب إنشاء المساعد وتمكين المفسر البرمجي أو الاسترجاع وحفظهما قبل تحميل الملفات كمعرفة.',
com_assistants_image_vision: 'رؤية الصورة',
com_assistants_append_date: 'إضافة التاريخ والوقت الحالي',
com_assistants_append_date_tooltip:
'عند التفعيل، سيتم إضافة التاريخ والوقت الحالي للعميل إلى تعليمات نظام المساعد.',
com_assistants_code_interpreter: 'مُفسِّر الشفرة',
com_assistants_code_interpreter_files: 'الملفات التالية متاحة فقط لمفسر الشفرة:',
com_assistants_retrieval: 'استرداد',

View file

@ -51,6 +51,9 @@ export default {
com_assistants_knowledge_disabled:
'O assistente deve ser criado, e o Interpretador de Código ou Recuperação deve ser habilitado e salvo antes de carregar arquivos como Conhecimento.',
com_assistants_image_vision: 'Visão de Imagem',
com_assistants_append_date: 'Anexar Data e Hora Atual',
com_assistants_append_date_tooltip:
'Quando ativado, a data e hora atual do cliente serão anexadas às instruções do sistema do assistente.',
com_assistants_code_interpreter: 'Interpretador de Código',
com_assistants_code_interpreter_files:
'Os arquivos abaixo são apenas para o Interpretador de Código:',

View file

@ -34,6 +34,9 @@ export default {
com_assistants_knowledge_disabled:
'Der Assistent muss erstellt und Code-Interpreter oder Abruf müssen aktiviert und gespeichert werden, bevor Dateien als Wissen hochgeladen werden können.',
com_assistants_image_vision: 'Bildanalyse',
com_assistants_append_date: 'Aktuelles Datum & Uhrzeit anhängen',
com_assistants_append_date_tooltip:
'Wenn aktiviert, werden das aktuelle Client-Datum und die Uhrzeit an die Systemanweisungen des Assistenten angehängt.',
com_assistants_code_interpreter: 'Code-Interpreter',
com_assistants_code_interpreter_files: 'Die folgenden Dateien sind nur für den Code-Interpreter:',
com_assistants_retrieval: 'Abruf',

View file

@ -70,6 +70,9 @@ export default {
com_assistants_knowledge_disabled:
'Assistant must be created, and Code Interpreter or Retrieval must be enabled and saved before uploading files as Knowledge.',
com_assistants_image_vision: 'Image Vision',
com_assistants_append_date: 'Append Current Date & Time',
com_assistants_append_date_tooltip:
'When enabled, the current client date and time will be appended to the assistant system instructions.',
com_assistants_code_interpreter: 'Code Interpreter',
com_assistants_code_interpreter_files: 'Files below are for Code Interpreter only:',
com_assistants_retrieval: 'Retrieval',

View file

@ -19,6 +19,9 @@ export default {
com_assistants_knowledge_disabled:
'El Asistente debe ser creado, y el Intérprete de Código o la Recuperación deben estar habilitados y guardados antes de subir archivos como Conocimiento.',
com_assistants_image_vision: 'Visión de Imagen',
com_assistants_append_date: 'Añadir Fecha y Hora Actual',
com_assistants_append_date_tooltip:
'Cuando está habilitado, la fecha y hora actual del cliente se adjuntarán a las instrucciones del sistema del asistente.',
com_assistants_code_interpreter: 'Intérprete de Código',
com_assistants_code_interpreter_files:
'Los siguientes archivos solo están disponibles para el Intérprete de Código:',

View file

@ -29,6 +29,9 @@ export default {
com_assistants_knowledge_disabled:
'Avustaja täytyy ensin luoda, ja Kooditulkki tai Tiedonhaku täytyy olla päällä ja asetukset tallennettuna, ennen kuin tiedostoja voidaan ladata Tietoihin.',
com_assistants_image_vision: 'Kuvanäkö',
com_assistants_append_date: 'Lisää nykyinen päivämäärä ja aika',
com_assistants_append_date_tooltip:
'Kun käytössä, nykyinen asiakkaan päivämäärä ja aika lisätään avustajan järjestelmäohjeisiin.',
com_assistants_code_interpreter: 'Kooditulkki',
com_assistants_code_interpreter_files: 'Seuraavat tiedostot ovat vain Kooditulkin käytettävissä:',
com_assistants_retrieval: 'Tiedonhaku',

View file

@ -479,6 +479,9 @@ export default {
com_assistants_knowledge_disabled:
'L\'assistant doit être créé, et l\'interpréteur de code ou la récupération doivent être activés et enregistrés avant de pouvoir importer des fichiers en tant que connaissances.',
com_assistants_image_vision: 'Vision d\'image',
com_assistants_append_date: 'Ajouter la date et l\'heure actuelles',
com_assistants_append_date_tooltip:
'Lorsque activé, la date et l\'heure actuelles du client seront ajoutées aux instructions du système de l\'assistant.',
com_assistants_code_interpreter: 'Interpréteur de code',
com_assistants_code_interpreter_files:
'Les fichiers suivants sont disponibles uniquement pour l\'interpréteur de code :',

View file

@ -11,6 +11,9 @@ export default {
'אם אתה מעלה קבצים תחת ידע, שיחות עם ה-סייען שלך עשויות לכלול תוכן מהקובץ.',
com_assistants_knowledge_disabled:
'יש ליצור סייען, ויש להפעיל ולשמור את מתורגמן קוד או אחזור לפני העלאת קבצים כ-ידע.',
com_assistants_append_date: 'הוסף תאריך ושעה נוכחיים',
com_assistants_append_date_tooltip:
'כשמופעל, תאריך ושעה נוכחיים של הלקוח יוספים להוראות מערכת הסייען.',
com_assistants_code_interpreter: 'מתורגמן קוד',
com_assistants_code_interpreter_files: 'הקבצים הבאים זמינים רק עבור מתורגמן קוד:',
com_assistants_retrieval: 'אחזור',

View file

@ -27,6 +27,9 @@ export default {
com_assistants_knowledge_disabled:
'L\'Assistente deve essere creato, e Code Interpreter o Retrieval devono essere abilitati e salvati prima di caricare file come Conoscenza.',
com_assistants_image_vision: 'Visione Immagine',
com_assistants_append_date: 'Aggiungi Data e Ora Attuali',
com_assistants_append_date_tooltip:
'Quando attivo, la data e l\'ora attuali del cliente saranno aggiunte alle istruzioni del sistema dell\'Assistente.',
com_assistants_code_interpreter: 'Interprete Codice',
com_assistants_code_interpreter_files:
'I seguenti file sono disponibili solo per Code Interpreter:',

View file

@ -48,6 +48,9 @@ export default {
com_assistants_knowledge_disabled:
'ファイルをナレッジとしてアップロードする前に、アシスタントを作成し、コードインタプリタまたは検索を有効にして保存する必要があります。',
com_assistants_image_vision: 'イメージビジョン',
com_assistants_append_date: '現在の日付と時刻を追加',
com_assistants_append_date_tooltip:
'有効にすると、現在のクライアントの日付と時刻がアシスタントのシステム指示に追加されます。',
com_assistants_code_interpreter: 'コードインタプリタ',
com_assistants_code_interpreter_files: '次のファイルはコードインタプリタでのみ使用できます。',
com_assistants_retrieval: '検索',

View file

@ -703,6 +703,9 @@ export default {
com_assistants_knowledge_disabled:
'지식으로 파일을 업로드하기 전에 Assistant를 생성하고 Code Interpreter 또는 Retrieval을 활성화한 후 저장해야 합니다.',
com_assistants_image_vision: '이미지 인식',
com_assistants_append_date: '현재 날짜와 시간 추가',
com_assistants_append_date_tooltip:
'활성화하면 현재 클라이언트의 날짜와 시간이 어시스턴트의 시스템 지침에 추가됩니다.',
com_assistants_code_interpreter: '코드 인터프리터',
com_assistants_code_interpreter_files: '코드 인터프리터에서만 다음 파일을 사용할 수 있습니다:',
com_assistants_retrieval: '검색',

View file

@ -5,6 +5,9 @@ export default {
com_sidepanel_assistant_builder: 'Конструктор Ассистента',
com_sidepanel_attach_files: 'Прикрепить файлы',
com_sidepanel_manage_files: 'Управление файлами',
com_assistants_append_date: 'Добавить текущую дату и время',
com_assistants_append_date_tooltip:
'Когда включено, текущая дата и время клиента будут добавлены к инструкциям системы Ассистента.',
com_assistants_code_interpreter: 'Интерпретатор кода',
com_assistants_code_interpreter_files: 'Следующие файлы доступны только для Интерпретатора кода:',
com_ui_examples: 'Примеры',

View file

@ -30,6 +30,9 @@ export default {
com_assistants_knowledge_disabled:
'Bilgi olarak dosya yüklemeden önce, Asistan oluşturulmalı ve Kod Yorumlayıcı veya Geri Getirme etkinleştirilip kaydedilmelidir.',
com_assistants_image_vision: 'Görüntü Vizyonu',
com_assistants_append_date: 'Şu anki tarih ve saati ekleyin',
com_assistants_append_date_tooltip:
'Etkinleştirildiğinde, şu anki müşteri tarihi ve saati, Asistanın sistem talimatlarına eklenir.',
com_assistants_code_interpreter: 'Kod Yorumlayıcı',
com_assistants_code_interpreter_files:
'Aşağıdaki dosyalar yalnızca Kod Yorumlayıcı için kullanılabilir:',

View file

@ -46,6 +46,8 @@ export default {
com_assistants_knowledge_disabled:
'必须创建助手,且启用并保存代码解释器或检索,才能将文件作为知识上传。',
com_assistants_image_vision: '识图',
com_assistants_append_date: '添加当前日期和时间',
com_assistants_append_date_tooltip: '启用后,当前客户的日期和时间将附加到助手的系统指令中。',
com_assistants_code_interpreter: '代码解释器',
com_assistants_code_interpreter_files: '以下文件仅适用于代码解释器:',
com_assistants_retrieval: '检索',

View file

@ -356,6 +356,8 @@ export default {
com_assistants_knowledge_disabled:
'助理必須先建立,並啟用及儲存「程式碼解譯器」或「資訊檢索」功能,才能上傳檔案作為知識庫。',
com_assistants_image_vision: '影像視覺',
com_assistants_append_date: '添加當前日期和時間',
com_assistants_append_date_tooltip: '啟用後,當前客戶的日期和時間將附加到助手的系統指令中。',
com_assistants_code_interpreter: '程式碼解譯器',
com_assistants_code_interpreter_files: '以下檔案僅適用於程式碼解譯器:',
com_assistants_retrieval: '檢索',