highperfocused/danswer
1
0
Fork 0
mirror of https://github.com/danswer-ai/danswer.git synced 2025-03-17 13:22:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Linting (#2704)

Browse Source 
* effect cleanup

* remove unused imports

* remove unne

* remove unnecessary packages

* k

* temp

* minor
This commit is contained in:
pablodanswer 2024-10-07 13:21:07 -07:00 committed by GitHub
parent 150dcc2883
commit 1900a390d8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
119 changed files with 368 additions and 371 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
backend/danswer/llm/chat_llm.py
View File

@ -283,6 +283,7 @@ class DefaultMultiLLM(LLM):
_convert_message_to_dict(msg) if isinstance(msg, BaseMessage) else msg
for msg in prompt
]
elif isinstance(prompt, str):
prompt = [_convert_message_to_dict(HumanMessage(content=prompt))]

5
web/.eslintrc.json
View File

@ -1,3 +1,6 @@
{
"extends": "next/core-web-vitals"
"extends": "next/core-web-vitals",
"rules": {
"@next/next/no-img-element": "off"
}
}

2
web/package.json
View File

@ -56,4 +56,4 @@
"eslint-config-next": "^14.1.0",
"prettier": "2.8.8"
}
}
}

23
web/src/app/admin/add-connector/page.tsx
View File

@ -6,7 +6,7 @@ import { SourceCategory, SourceMetadata } from "@/lib/search/interfaces";
import { listSourceMetadata } from "@/lib/sources";
import { Title, Text, Button } from "@tremor/react";
import Link from "next/link";
import { useEffect, useMemo, useRef, useState } from "react";
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
function SourceTile({
sourceMetadata,
@ -49,15 +49,18 @@ export default function Page() {
searchInputRef.current.focus();
}
}, []);
const filterSources = (sources: SourceMetadata[]) => {
if (!searchTerm) return sources;
const lowerSearchTerm = searchTerm.toLowerCase();
return sources.filter(
(source) =>
source.displayName.toLowerCase().includes(lowerSearchTerm) ||
source.category.toLowerCase().includes(lowerSearchTerm)
);
};
const filterSources = useCallback(
(sources: SourceMetadata[]) => {
if (!searchTerm) return sources;
const lowerSearchTerm = searchTerm.toLowerCase();
return sources.filter(
(source) =>
source.displayName.toLowerCase().includes(lowerSearchTerm) ||
source.category.toLowerCase().includes(lowerSearchTerm)
);
},
[searchTerm]
);
const categorizedSources = useMemo(() => {
const filtered = filterSources(sources);

6
web/src/app/admin/assistants/AssistantEditor.tsx
View File

@ -132,7 +132,7 @@ export function AssistantEditor({
if (defaultIconShape === null) {
setDefaultIconShape(generateRandomIconShape().encodedGrid);
}
}, []);
}, [defaultIconShape]);
const [isIconDropdownOpen, setIsIconDropdownOpen] = useState(false);
@ -166,7 +166,7 @@ export function AssistantEditor({
existingPersona.num_chunks === 0
);
}
}, [isUpdate, existingPrompt]);
}, [isUpdate, existingPrompt, existingPersona?.num_chunks]);
const defaultProvider = llmProviders.find(
(llmProvider) => llmProvider.is_default_provider
@ -888,7 +888,7 @@ export function AssistantEditor({
values.document_set_ids.indexOf(
documentSet.id
);
let isSelected = ind !== -1;
const isSelected = ind !== -1;
return (
<DocumentSetSelectable
key={documentSet.id}

1
web/src/app/admin/assistants/CollapsibleSection.tsx
View File

@ -1,5 +1,4 @@
"use client";
import { Button } from "@tremor/react";
import React, { ReactNode, useState } from "react";
import { FiSettings } from "react-icons/fi";

10
web/src/app/admin/assistants/PersonaTable.tsx
View File

@ -5,7 +5,7 @@ import { Persona } from "./interfaces";
import { useRouter } from "next/navigation";
import { CustomCheckbox } from "@/components/CustomCheckbox";
import { usePopup } from "@/components/admin/connectors/Popup";
import { useState, useMemo, useEffect } from "react";
import { useState, useMemo } from "react";
import { UniqueIdentifier } from "@dnd-kit/core";
import { DraggableTable } from "@/components/table/DraggableTable";
import {
@ -15,8 +15,6 @@ import {
} from "./lib";
import { FiEdit2 } from "react-icons/fi";
import { TrashIcon } from "@/components/icons/icons";
import { getCurrentUser } from "@/lib/user";
import { UserRole, User } from "@/lib/types";
import { useUser } from "@/components/user/UserProvider";
function PersonaTypeDisplay({ persona }: { persona: Persona }) {
@ -51,9 +49,9 @@ export function PersonasTable({
const { isLoadingUser, isAdmin } = useUser();
const editablePersonaIds = new Set(
editablePersonas.map((p) => p.id.toString())
);
const editablePersonaIds = useMemo(() => {
return new Set(editablePersonas.map((p) => p.id.toString()));
}, [editablePersonas]);
const sortedPersonas = useMemo(() => {
const editable = editablePersonas.sort(personaComparator);

2
web/src/app/admin/assistants/lib.ts
View File

@ -276,7 +276,7 @@ export function buildFinalPrompt(
taskPrompt: string,
retrievalDisabled: boolean
) {
let queryString = Object.entries({
const queryString = Object.entries({
system_prompt: systemPrompt,
task_prompt: taskPrompt,
retrieval_disabled: retrievalDisabled,

2
web/src/app/admin/assistants/page.tsx
View File

@ -5,7 +5,7 @@ import { Divider, Text, Title } from "@tremor/react";
import { fetchSS } from "@/lib/utilsSS";
import { ErrorCallout } from "@/components/ErrorCallout";
import { Persona } from "./interfaces";
import { AssistantsIcon, RobotIcon } from "@/components/icons/icons";
import { AssistantsIcon } from "@/components/icons/icons";
import { AdminPageTitle } from "@/components/admin/Title";
export default async function Page() {

3
web/src/app/admin/bot/SlackBotConfigCreationForm.tsx
View File

@ -20,7 +20,6 @@ import { Button, Card, Divider } from "@tremor/react";
import { useRouter } from "next/navigation";
import { Persona } from "../assistants/interfaces";
import { useState } from "react";
import MultiSelectDropdown from "@/components/MultiSelectDropdown";
import { AdvancedOptionsToggle } from "@/components/AdvancedOptionsToggle";
import { DocumentSetSelectable } from "@/components/documentSet/DocumentSetSelectable";
import CollapsibleSection from "../assistants/CollapsibleSection";
@ -229,7 +228,7 @@ export const SlackBotCreationForm = ({
const ind = values.document_sets.indexOf(
documentSet.id
);
let isSelected = ind !== -1;
const isSelected = ind !== -1;
return (
<DocumentSetSelectable

3
web/src/app/admin/bot/new/page.tsx
View File

@ -3,9 +3,8 @@ import { CPUIcon } from "@/components/icons/icons";
import { SlackBotCreationForm } from "../SlackBotConfigCreationForm";
import { fetchSS } from "@/lib/utilsSS";
import { ErrorCallout } from "@/components/ErrorCallout";
import { DocumentSet, StandardAnswerCategory } from "@/lib/types";
import { DocumentSet } from "@/lib/types";
import { BackButton } from "@/components/BackButton";
import { Text } from "@tremor/react";
import {
FetchAssistantsResponse,
fetchAssistantsSS,

15
web/src/app/admin/bot/page.tsx
View File

@ -2,12 +2,7 @@
import { ThreeDotsLoader } from "@/components/Loading";
import { PageSelector } from "@/components/PageSelector";
import {
CPUIcon,
EditIcon,
SlackIcon,
TrashIcon,
} from "@/components/icons/icons";
import { EditIcon, SlackIcon, TrashIcon } from "@/components/icons/icons";
import { SlackBotConfig } from "@/lib/types";
import { useState } from "react";
import { useSlackBotConfigs, useSlackBotTokens } from "./hooks";
@ -26,12 +21,7 @@ import {
Text,
Title,
} from "@tremor/react";
import {
FiArrowUpRight,
FiChevronDown,
FiChevronUp,
FiSlack,
} from "react-icons/fi";
import { FiArrowUpRight, FiChevronDown, FiChevronUp } from "react-icons/fi";
import Link from "next/link";
import { InstantSSRAutoRefresh } from "@/components/SSRAutoRefresh";
import { ErrorCallout } from "@/components/ErrorCallout";
@ -223,6 +213,7 @@ const Main = () => {
className="text-blue-500"
href="https://docs.danswer.dev/slack_bot_setup"
target="_blank"
rel="noreferrer"
>
guide{" "}
</a>

2
web/src/app/admin/configuration/llm/CustomLLMProviderUpdateForm.tsx
View File

@ -220,6 +220,7 @@ export function CustomLLMProviderUpdateForm({
target="_blank"
href="https://docs.litellm.ai/docs/providers"
className="text-link"
rel="noreferrer"
>
https://docs.litellm.ai/docs/providers
</a>
@ -373,6 +374,7 @@ export function CustomLLMProviderUpdateForm({
target="_blank"
href="https://models.litellm.ai/"
className="text-link"
rel="noreferrer"
>
here
</a>

1
web/src/app/admin/configuration/llm/page.tsx
View File

@ -1,7 +1,6 @@
"use client";
import { AdminPageTitle } from "@/components/admin/Title";
import { FiCpu } from "react-icons/fi";
import { LLMConfiguration } from "./LLMConfiguration";
import { CpuIcon } from "@/components/icons/icons";

17
web/src/app/admin/configuration/search/UpgradingPage.tsx
View File

@ -63,13 +63,16 @@ export default function UpgradingPage({
}
setIsCancelling(false);
};
const statusOrder: Record<ValidStatuses, number> = {
failed: 0,
completed_with_errors: 1,
not_started: 2,
in_progress: 3,
success: 4,
};
const statusOrder: Record<ValidStatuses, number> = useMemo(
() => ({
failed: 0,
completed_with_errors: 1,
not_started: 2,
in_progress: 3,
success: 4,
}),
[]
);
const sortedReindexingProgress = useMemo(() => {
return [...(ongoingReIndexingStatus || [])].sort((a, b) => {

88
web/src/app/admin/connector/[ccPairId]/IndexingAttemptsTable.tsx
View File

@ -1,6 +1,6 @@
"use client";
import { useEffect, useRef } from "react";
import { useCallback, useEffect, useRef, useState } from "react";
import {
Table,
TableHead,
@ -10,9 +10,8 @@ import {
TableCell,
Text,
} from "@tremor/react";
import { CCPairFullInfo } from "./types";
import { CCPairFullInfo, PaginatedIndexAttempts } from "./types";
import { IndexAttemptStatus } from "@/components/Status";
import { useState } from "react";
import { PageSelector } from "@/components/PageSelector";
import { ThreeDotsLoader } from "@/components/Loading";
import { buildCCPairInfoUrl } from "./lib";
@ -22,7 +21,6 @@ import { ErrorCallout } from "@/components/ErrorCallout";
import { InfoIcon, SearchIcon } from "@/components/icons/icons";
import Link from "next/link";
import ExceptionTraceModal from "@/components/modals/ExceptionTraceModal";
import { PaginatedIndexAttempts } from "./types";
import { useRouter } from "next/navigation";
import { Tooltip } from "@/components/tooltip/Tooltip";
@ -61,47 +59,59 @@ export function IndexingAttemptsTable({ ccPair }: { ccPair: CCPairFullInfo }) {
// we use it to avoid duplicate requests
const ongoingRequestsRef = useRef<Set<number>>(new Set());
const batchRetrievalUrlBuilder = (batchNum: number) =>
`${buildCCPairInfoUrl(ccPair.id)}/index-attempts?page=${batchNum}&page_size=${BATCH_SIZE * NUM_IN_PAGE}`;
const batchRetrievalUrlBuilder = useCallback(
(batchNum: number) => {
return `${buildCCPairInfoUrl(ccPair.id)}/index-attempts?page=${batchNum}&page_size=${BATCH_SIZE * NUM_IN_PAGE}`;
},
[ccPair.id]
);
// This fetches and caches the data for a given batch number
const fetchBatchData = async (batchNum: number) => {
if (ongoingRequestsRef.current.has(batchNum)) return;
ongoingRequestsRef.current.add(batchNum);
const fetchBatchData = useCallback(
async (batchNum: number) => {
if (ongoingRequestsRef.current.has(batchNum)) return;
ongoingRequestsRef.current.add(batchNum);
try {
const response = await fetch(batchRetrievalUrlBuilder(batchNum + 1));
if (!response.ok) {
throw new Error("Failed to fetch data");
}
const data = await response.json();
try {
const response = await fetch(batchRetrievalUrlBuilder(batchNum + 1));
if (!response.ok) {
throw new Error("Failed to fetch data");
}
const data = await response.json();
const newBatchData: PaginatedIndexAttempts[] = [];
for (let i = 0; i < BATCH_SIZE; i++) {
const startIndex = i * NUM_IN_PAGE;
const endIndex = startIndex + NUM_IN_PAGE;
const pageIndexAttempts = data.index_attempts.slice(
startIndex,
endIndex
const newBatchData: PaginatedIndexAttempts[] = [];
for (let i = 0; i < BATCH_SIZE; i++) {
const startIndex = i * NUM_IN_PAGE;
const endIndex = startIndex + NUM_IN_PAGE;
const pageIndexAttempts = data.index_attempts.slice(
startIndex,
endIndex
);
newBatchData.push({
...data,
index_attempts: pageIndexAttempts,
});
}
setCachedBatches((prev) => ({
...prev,
[batchNum]: newBatchData,
}));
} catch (error) {
setCurrentPageError(
error instanceof Error ? error : new Error("An error occurred")
);
newBatchData.push({
...data,
index_attempts: pageIndexAttempts,
});
} finally {
ongoingRequestsRef.current.delete(batchNum);
}
setCachedBatches((prev) => ({
...prev,
[batchNum]: newBatchData,
}));
} catch (error) {
setCurrentPageError(
error instanceof Error ? error : new Error("An error occurred")
);
} finally {
ongoingRequestsRef.current.delete(batchNum);
}
};
},
[
ongoingRequestsRef,
setCachedBatches,
setCurrentPageError,
batchRetrievalUrlBuilder,
]
);
// This fetches and caches the data for the current batch and the next and previous batches
useEffect(() => {

47
web/src/app/admin/connector/[ccPairId]/page.tsx
View File

@ -1,29 +1,29 @@
"use client";
import { CCPairFullInfo, ConnectorCredentialPairStatus } from "./types";
import { CCPairStatus } from "@/components/Status";
import { BackButton } from "@/components/BackButton";
import { Button, Divider, Title } from "@tremor/react";
import { IndexingAttemptsTable } from "./IndexingAttemptsTable";
import { AdvancedConfigDisplay, ConfigDisplay } from "./ConfigDisplay";
import { ModifyStatusButtonCluster } from "./ModifyStatusButtonCluster";
import { DeletionButton } from "./DeletionButton";
import { ErrorCallout } from "@/components/ErrorCallout";
import { ReIndexButton } from "./ReIndexButton";
import { ValidSources } from "@/lib/types";
import useSWR, { mutate } from "swr";
import { errorHandlingFetcher } from "@/lib/fetcher";
import { ThreeDotsLoader } from "@/components/Loading";
import CredentialSection from "@/components/credentials/CredentialSection";
import { buildCCPairInfoUrl } from "./lib";
import { SourceIcon } from "@/components/SourceIcon";
import { credentialTemplates } from "@/lib/connectors/credentials";
import { useEffect, useRef, useState } from "react";
import { CheckmarkIcon, EditIcon, XIcon } from "@/components/icons/icons";
import { CCPairStatus } from "@/components/Status";
import { usePopup } from "@/components/admin/connectors/Popup";
import CredentialSection from "@/components/credentials/CredentialSection";
import { CheckmarkIcon, EditIcon, XIcon } from "@/components/icons/icons";
import { updateConnectorCredentialPairName } from "@/lib/connector";
import DeletionErrorStatus from "./DeletionErrorStatus";
import { credentialTemplates } from "@/lib/connectors/credentials";
import { errorHandlingFetcher } from "@/lib/fetcher";
import { ValidSources } from "@/lib/types";
import { Button, Divider, Title } from "@tremor/react";
import { useRouter } from "next/navigation";
import { useCallback, useEffect, useRef, useState } from "react";
import useSWR, { mutate } from "swr";
import { AdvancedConfigDisplay, ConfigDisplay } from "./ConfigDisplay";
import { DeletionButton } from "./DeletionButton";
import DeletionErrorStatus from "./DeletionErrorStatus";
import { IndexingAttemptsTable } from "./IndexingAttemptsTable";
import { ModifyStatusButtonCluster } from "./ModifyStatusButtonCluster";
import { ReIndexButton } from "./ReIndexButton";
import { buildCCPairInfoUrl } from "./lib";
import { CCPairFullInfo, ConnectorCredentialPairStatus } from "./types";
// since the uploaded files are cleaned up after some period of time
// re-indexing will not work for the file connector. Also, it would not
@ -49,7 +49,7 @@ function Main({ ccPairId }: { ccPairId: number }) {
const { popup, setPopup } = usePopup();
const finishConnectorDeletion = () => {
const finishConnectorDeletion = useCallback(() => {
setPopup({
message: "Connector deleted successfully",
type: "success",
@ -57,7 +57,7 @@ function Main({ ccPairId }: { ccPairId: number }) {
setTimeout(() => {
router.push("/admin/indexing/status");
}, 2000);
};
}, [router, setPopup]);
useEffect(() => {
if (isEditing && inputRef.current) {
@ -80,7 +80,14 @@ function Main({ ccPairId }: { ccPairId: number }) {
) {
finishConnectorDeletion();
}
}, [isLoading, ccPair, error, hasLoadedOnce, router]);
}, [
isLoading,
ccPair,
error,
hasLoadedOnce,
router,
finishConnectorDeletion,
]);
const handleNameChange = (e: React.ChangeEvent<HTMLInputElement>) => {
setEditableName(e.target.value);

5
web/src/app/admin/connectors/[connector]/AddConnectorPage.tsx
View File

@ -1,6 +1,6 @@
"use client";
import { FetchError, errorHandlingFetcher } from "@/lib/fetcher";
import { errorHandlingFetcher } from "@/lib/fetcher";
import useSWR, { mutate } from "swr";
import { HealthCheckBanner } from "@/components/health/healthcheck";
@ -29,6 +29,8 @@ import {
defaultPruneFreqDays,
defaultRefreshFreqMinutes,
isLoadState,
Connector,
ConnectorBase,
} from "@/lib/connectors/connectors";
import { Modal } from "@/components/Modal";
import GDriveMain from "./pages/gdrive/GoogleDrivePage";
@ -47,7 +49,6 @@ export interface AdvancedConfig {
pruneFreq: number;
indexingStart: string;
}
import { Connector, ConnectorBase } from "@/lib/connectors/connectors";
const BASE_CONNECTOR_URL = "/api/manage/admin/connector";

2
web/src/app/admin/connectors/[connector]/ConnectorWrapper.tsx
View File

@ -1,6 +1,6 @@
"use client";
import { ConfigurableSources, ValidSources } from "@/lib/types";
import { ConfigurableSources } from "@/lib/types";
import AddConnector from "./AddConnectorPage";
import { FormProvider } from "@/components/context/FormContext";
import Sidebar from "./Sidebar";

2
web/src/app/admin/connectors/[connector]/Sidebar.tsx
View File

@ -1,7 +1,7 @@
import { useFormContext } from "@/components/context/FormContext";
import { HeaderTitle } from "@/components/header/HeaderTitle";
import { BackIcon, SettingsIcon } from "@/components/icons/icons";
import { SettingsIcon } from "@/components/icons/icons";
import { Logo } from "@/components/Logo";
import { SettingsContext } from "@/components/settings/SettingsProvider";
import { credentialTemplates } from "@/lib/connectors/credentials";

2
web/src/app/admin/connectors/[connector]/pages/ConnectorInput/NumberInput.tsx
View File

@ -1,5 +1,5 @@
import { SubLabel } from "@/components/admin/connectors/Field";
import { Field, useFormikContext } from "formik";
import { Field } from "formik";
export default function NumberInput({
label,

6
web/src/app/admin/connectors/[connector]/pages/ConnectorInput/SelectInput.tsx
View File

@ -1,9 +1,5 @@
import CredentialSubText from "@/components/credentials/CredentialFields";
import {
ListOption,
SelectOption,
StringWithDescription,
} from "@/lib/connectors/connectors";
import { StringWithDescription } from "@/lib/connectors/connectors";
import { Field } from "formik";
export default function SelectInput({

5
web/src/app/admin/connectors/[connector]/pages/gdrive/Credential.tsx
View File

@ -10,15 +10,13 @@ import { GOOGLE_DRIVE_AUTH_IS_ADMIN_COOKIE_NAME } from "@/lib/constants";
import Cookies from "js-cookie";
import { TextFormField } from "@/components/admin/connectors/Field";
import { Form, Formik } from "formik";
import { Card } from "@tremor/react";
import { Button as TremorButton } from "@tremor/react";
import {
Credential,
GoogleDriveCredentialJson,
GoogleDriveServiceAccountCredentialJson,
} from "@/lib/connectors/credentials";
import { Button as TremorButton } from "@tremor/react";
type GoogleDriveCredentialJsonTypes = "authorized_user" | "service_account";
export const DriveJsonUpload = ({
@ -285,6 +283,7 @@ export const DriveJsonUploadSection = ({
className="text-link"
target="_blank"
href="https://docs.danswer.dev/connectors/google_drive#authorization"
rel="noreferrer"
>
here
</a>{" "}

7
web/src/app/admin/connectors/[connector]/pages/gdrive/GoogleDrivePage.tsx
View File

@ -1,14 +1,16 @@
"use client";
import React from "react";
import { useState, useEffect } from "react";
import useSWR from "swr";
import { FetchError, errorHandlingFetcher } from "@/lib/fetcher";
import { ErrorCallout } from "@/components/ErrorCallout";
import { LoadingAnimation } from "@/components/Loading";
import { usePopup } from "@/components/admin/connectors/Popup";
import { ConnectorIndexingStatus } from "@/lib/types";
import { usePublicCredentials } from "@/lib/hooks";
import {
usePublicCredentials,
useConnectorCredentialIndexingStatus,
} from "@/lib/hooks";
import { Title } from "@tremor/react";
import { DriveJsonUploadSection, DriveOAuthSection } from "./Credential";
import {
@ -18,7 +20,6 @@ import {
} from "@/lib/connectors/credentials";
import { GoogleDriveConfig } from "@/lib/connectors/connectors";
import { useUser } from "@/components/user/UserProvider";
import { useConnectorCredentialIndexingStatus } from "@/lib/hooks";
const GDriveMain = ({}: {}) => {
const { isLoadingUser, isAdmin } = useUser();

1
web/src/app/admin/connectors/[connector]/pages/gmail/Credential.tsx
View File

@ -271,6 +271,7 @@ export const GmailJsonUploadSection = ({
className="text-link"
target="_blank"
href="https://docs.danswer.dev/connectors/gmail#authorization"
rel="noreferrer"
>
here
</a>{" "}

9
web/src/app/admin/connectors/[connector]/pages/gmail/GmailPage.tsx
View File

@ -5,20 +5,19 @@ import { errorHandlingFetcher } from "@/lib/fetcher";
import { LoadingAnimation } from "@/components/Loading";
import { usePopup } from "@/components/admin/connectors/Popup";
import { ConnectorIndexingStatus } from "@/lib/types";
import { getCurrentUser } from "@/lib/user";
import { User, UserRole } from "@/lib/types";
import {
Credential,
GmailCredentialJson,
GmailServiceAccountCredentialJson,
} from "@/lib/connectors/credentials";
import { GmailOAuthSection, GmailJsonUploadSection } from "./Credential";
import { usePublicCredentials } from "@/lib/hooks";
import {
usePublicCredentials,
useConnectorCredentialIndexingStatus,
} from "@/lib/hooks";
import { Title } from "@tremor/react";
import { GmailConfig } from "@/lib/connectors/connectors";
import { useState, useEffect } from "react";
import { useUser } from "@/components/user/UserProvider";
import { useConnectorCredentialIndexingStatus } from "@/lib/hooks";
export const GmailMain = () => {
const { isLoadingUser, isAdmin } = useUser();

32
web/src/app/admin/documents/explorer/Explorer.tsx
View File

@ -2,7 +2,7 @@
import { adminSearch } from "./lib";
import { MagnifyingGlass } from "@phosphor-icons/react";
import { useState, useEffect } from "react";
import { useState, useEffect, useCallback } from "react";
import { DanswerDocument } from "@/lib/search/interfaces";
import { buildDocumentSummaryDisplay } from "@/components/search/DocumentDisplay";
import { CustomCheckbox } from "@/components/CustomCheckbox";
@ -121,19 +121,27 @@ export function Explorer({
const filterManager = useFilters();
const onSearch = async (query: string) => {
const filters = buildFilters(
filterManager.selectedSources,
const onSearch = useCallback(
async (query: string) => {
const filters = buildFilters(
filterManager.selectedSources,
filterManager.selectedDocumentSets,
filterManager.timeRange,
filterManager.selectedTags
);
const results = await adminSearch(query, filters);
if (results.ok) {
setResults((await results.json()).documents);
}
setTimeoutId(null);
},
[
filterManager.selectedDocumentSets,
filterManager.selectedSources,
filterManager.timeRange,
filterManager.selectedTags
);
const results = await adminSearch(query, filters);
if (results.ok) {
setResults((await results.json()).documents);
}
setTimeoutId(null);
};
filterManager.selectedTags,
]
);
useEffect(() => {
if (timeoutId !== null) {

1
web/src/app/admin/documents/feedback/DocumentFeedbackTable.tsx
View File

@ -1,4 +1,3 @@
import { BasicTable } from "@/components/admin/connectors/BasicTable";
import { usePopup } from "@/components/admin/connectors/Popup";
import { useState } from "react";
import {

4
web/src/app/admin/documents/sets/DocumentSetCreationForm.tsx
View File

@ -177,7 +177,7 @@ export const DocumentSetCreationForm = ({
const ind = props.values.cc_pair_ids.indexOf(
ccPair.cc_pair_id
);
let isSelected = ind !== -1;
const isSelected = ind !== -1;
return (
<div
key={`${ccPair.connector.id}-${ccPair.credential.id}`}
@ -291,7 +291,7 @@ export const DocumentSetCreationForm = ({
const ind = props.values.cc_pair_ids.indexOf(
ccPair.cc_pair_id
);
let isSelected = ind !== -1;
const isSelected = ind !== -1;
return (
<div
key={`${ccPair.connector.id}-${ccPair.credential.id}`}

1
web/src/app/admin/documents/sets/new/page.tsx
View File

@ -13,7 +13,6 @@ import { Card } from "@tremor/react";
import { BackButton } from "@/components/BackButton";
import { ErrorCallout } from "@/components/ErrorCallout";
import { useRouter } from "next/navigation";
import { UserGroup } from "@/lib/types";
import { refreshDocumentSets } from "../hooks";
function Main() {

7
web/src/app/admin/documents/sets/page.tsx
View File

@ -13,18 +13,17 @@ import {
Title,
Divider,
Badge,
Button,
Text,
} from "@tremor/react";
import { useConnectorCredentialIndexingStatus } from "@/lib/hooks";
import { ConnectorIndexingStatus, DocumentSet } from "@/lib/types";
import { useState, useEffect } from "react";
import { getCurrentUser } from "@/lib/user";
import { User, UserRole } from "@/lib/types";
import { useState } from "react";
import { useDocumentSets } from "./hooks";
import { ConnectorTitle } from "@/components/admin/connectors/ConnectorTitle";
import { deleteDocumentSet } from "./lib";
import { PopupSpec, usePopup } from "@/components/admin/connectors/Popup";
import { AdminPageTitle } from "@/components/admin/Title";
import { Button, Text } from "@tremor/react";
import {
FiAlertTriangle,
FiCheckCircle,

1
web/src/app/admin/embeddings/EmbeddingModelSelectionForm.tsx
View File

@ -6,7 +6,6 @@ import { Dispatch, SetStateAction, useState } from "react";
import {
CloudEmbeddingProvider,
CloudEmbeddingModel,
AVAILABLE_CLOUD_PROVIDERS,
AVAILABLE_MODELS,
INVALID_OLD_MODEL,
HostedEmbeddingModel,

2
web/src/app/admin/embeddings/modals/ChangeCredentialsModal.tsx
View File

@ -1,7 +1,7 @@
import React, { useRef, useState } from "react";
import { Modal } from "@/components/Modal";
import { Button, Text, Callout, Subtitle, Divider } from "@tremor/react";
import { Label, TextFormField } from "@/components/admin/connectors/Field";
import { Label } from "@/components/admin/connectors/Field";
import { CloudEmbeddingProvider } from "../../../../components/embedding/interfaces";
import {
EMBEDDING_PROVIDERS_ADMIN_URL,

5
web/src/app/admin/embeddings/modals/ModelSelectionModal.tsx
View File

@ -1,9 +1,6 @@
import { Modal } from "@/components/Modal";
import { Button, Text, Callout } from "@tremor/react";
import {
EmbeddingModelDescriptor,
HostedEmbeddingModel,
} from "../../../../components/embedding/interfaces";
import { HostedEmbeddingModel } from "../../../../components/embedding/interfaces";
export function ModelSelectionConfirmationModal({
selectedModel,

3
web/src/app/admin/embeddings/modals/ProviderCreationModal.tsx
View File

@ -167,6 +167,7 @@ export function ProviderCreationModal({
className="cursor-pointer underline"
target="_blank"
href={selectedProvider.docsLink}
rel="noreferrer"
>
here
</a>{" "}
@ -175,6 +176,7 @@ export function ProviderCreationModal({
className="cursor-pointer underline"
target="_blank"
href={selectedProvider.apiLink}
rel="noreferrer"
>
{isProxy ? "API URL" : "API KEY"}
</a>
@ -223,6 +225,7 @@ export function ProviderCreationModal({
href={selectedProvider.apiLink}
target="_blank"
className="underline cursor-pointer"
rel="noreferrer"
>
Learn more here
</a>

3
web/src/app/admin/embeddings/pages/AdvancedEmbeddingFormPage.tsx
View File

@ -1,7 +1,6 @@
import React, { Dispatch, forwardRef, SetStateAction } from "react";
import React, { forwardRef } from "react";
import { Formik, Form, FormikProps, FieldArray, Field } from "formik";
import * as Yup from "yup";
import CredentialSubText from "@/components/credentials/CredentialFields";
import { TrashIcon } from "@/components/icons/icons";
import { FaPlus } from "react-icons/fa";
import { AdvancedSearchConfiguration } from "../interfaces";

4
web/src/app/admin/embeddings/pages/CloudEmbeddingPage.tsx
View File

@ -1,6 +1,6 @@
"use client";
import { Button, Card, Text, Title } from "@tremor/react";
import { Card, Text, Title } from "@tremor/react";
import {
CloudEmbeddingProvider,
@ -56,7 +56,7 @@ export default function CloudEmbeddingPage({
);
}
let providers: CloudEmbeddingProviderFull[] = AVAILABLE_CLOUD_PROVIDERS.map(
const providers: CloudEmbeddingProviderFull[] = AVAILABLE_CLOUD_PROVIDERS.map(
(model) => ({
...model,
configured:

2
web/src/app/admin/embeddings/pages/EmbeddingFormPage.tsx
View File

@ -165,7 +165,7 @@ export default function EmbeddingForm() {
}
const updateSearch = async () => {
let values: SavedSearchSettings = {
const values: SavedSearchSettings = {
...rerankingDetails,
...advancedEmbeddingDetails,
provider_type:

11
web/src/app/admin/embeddings/pages/OpenEmbeddingPage.tsx
View File

@ -1,5 +1,5 @@
"use client";
import { Button, Card, Text } from "@tremor/react";
import { Button, Card, Text, Title } from "@tremor/react";
import { ModelSelector } from "../../../../components/embedding/ModelSelector";
import {
AVAILABLE_MODELS,
@ -8,7 +8,6 @@ import {
} from "../../../../components/embedding/interfaces";
import { CustomModelForm } from "../../../../components/embedding/CustomModelForm";
import { useState } from "react";
import { Title } from "@tremor/react";
export default function OpenEmbeddingPage({
onSelectOpenSource,
selectedProvider,
@ -34,7 +33,12 @@ export default function OpenEmbeddingPage({
<Text className="mt-6">
Alternatively, (if you know what you&apos;re doing) you can specify a{" "}
<a target="_blank" href="https://www.sbert.net/" className="text-link">
<a
target="_blank"
href="https://www.sbert.net/"
className="text-link"
rel="noreferrer"
>
SentenceTransformers
</a>
-compatible model of your choice below. The rough list of supported
@ -43,6 +47,7 @@ export default function OpenEmbeddingPage({
target="_blank"
href="https://huggingface.co/models?library=sentence-transformers&sort=trending"
className="text-link"
rel="noreferrer"
>
here
</a>

1
web/src/app/admin/indexing/[id]/page.tsx
View File

@ -4,7 +4,6 @@ import { BackButton } from "@/components/BackButton";
import { ErrorCallout } from "@/components/ErrorCallout";
import { ThreeDotsLoader } from "@/components/Loading";
import { errorHandlingFetcher } from "@/lib/fetcher";
import { ValidSources } from "@/lib/types";
import { Title } from "@tremor/react";
import useSWR from "swr";
import { IndexAttemptErrorsTable } from "./IndexAttemptErrorsTable";

4
web/src/app/admin/indexing/status/page.tsx
View File

@ -1,11 +1,7 @@
"use client";
import useSWR from "swr";
import { LoadingAnimation } from "@/components/Loading";
import { NotebookIcon } from "@/components/icons/icons";
import { errorHandlingFetcher } from "@/lib/fetcher";
import { ConnectorIndexingStatus } from "@/lib/types";
import { CCPairIndexingStatusTable } from "./CCPairIndexingStatusTable";
import { AdminPageTitle } from "@/components/admin/Title";
import Link from "next/link";

4
web/src/app/admin/prompt-library/modals/AddPromptModal.tsx
View File

@ -1,8 +1,8 @@
import React from "react";
import { Formik, Form, Field, ErrorMessage } from "formik";
import { Formik, Form } from "formik";
import * as Yup from "yup";
import { ModalWrapper } from "@/components/modals/ModalWrapper";
import { Button, Textarea, TextInput } from "@tremor/react";
import { Button } from "@tremor/react";
import { BookstackIcon } from "@/components/icons/icons";
import { AddPromptModalProps } from "../interfaces";

1
web/src/app/admin/prompt-library/promptLibrary.tsx
View File

@ -16,7 +16,6 @@ import { FilterDropdown } from "@/components/search/filtering/FilterDropdown";
import { FiTag } from "react-icons/fi";
import { PageSelector } from "@/components/PageSelector";
import { InputPrompt } from "./interfaces";
import { Modal } from "@/components/Modal";
import { DeleteEntityModal } from "@/components/modals/DeleteEntityModal";
const CategoryBubble = ({

6
web/src/app/admin/settings/SettingsForm.tsx
View File

@ -2,15 +2,13 @@
import { Label, SubLabel } from "@/components/admin/connectors/Field";
import { usePopup } from "@/components/admin/connectors/Popup";
import { Title } from "@tremor/react";
import { Title, Button } from "@tremor/react";
import { Settings } from "./interfaces";
import { useRouter } from "next/navigation";
import { DefaultDropdown, Option } from "@/components/Dropdown";
import { useContext } from "react";
import React, { useContext, useState, useEffect } from "react";
import { SettingsContext } from "@/components/settings/SettingsProvider";
import React, { useState, useEffect } from "react";
import { usePaidEnterpriseFeaturesEnabled } from "@/components/settings/usePaidEnterpriseFeaturesEnabled";
import { Button } from "@tremor/react";
function Checkbox({
label,

2
web/src/app/admin/token-rate-limits/page.tsx
View File

@ -11,7 +11,7 @@ import {
Text,
} from "@tremor/react";
import { useState } from "react";
import { FiGlobe, FiShield, FiUser, FiUsers } from "react-icons/fi";
import { FiGlobe, FiUser, FiUsers } from "react-icons/fi";
import {
insertGlobalTokenRateLimit,
insertGroupTokenRateLimit,

43
web/src/app/admin/tools/ToolEditor.tsx
View File

@ -13,7 +13,7 @@ import {
import * as Yup from "yup";
import { MethodSpec, ToolSnapshot } from "@/lib/tools/interfaces";
import { TextFormField } from "@/components/admin/connectors/Field";
import { Button, Divider, Text } from "@tremor/react";
import { Button, Divider } from "@tremor/react";
import {
createCustomTool,
updateCustomTool,
@ -64,28 +64,31 @@ function ToolForm({
const [definitionError, setDefinitionError] = definitionErrorState;
const [methodSpecs, setMethodSpecs] = methodSpecsState;
const [showAdvancedOptions, setShowAdvancedOptions] = useState(false);
const debouncedValidateDefinition = useCallback(
debounce(async (definition: string) => {
try {
const parsedDefinition = parseJsonWithTrailingCommas(definition);
const response = await validateToolDefinition({
definition: parsedDefinition,
});
if (response.error) {
(definition: string) => {
const validateDefinition = async () => {
try {
const parsedDefinition = parseJsonWithTrailingCommas(definition);
const response = await validateToolDefinition({
definition: parsedDefinition,
});
if (response.error) {
setMethodSpecs(null);
setDefinitionError(response.error);
} else {
setMethodSpecs(response.data);
setDefinitionError(null);
}
} catch (error) {
console.log(error);
setMethodSpecs(null);
setDefinitionError(response.error);
} else {
setMethodSpecs(response.data);
setDefinitionError(null);
setDefinitionError("Invalid JSON format");
}
} catch (error) {
console.log(error);
setMethodSpecs(null);
setDefinitionError("Invalid JSON format");
}
}, 300),
[]
};
debounce(validateDefinition, 300)();
},
[setMethodSpecs, setDefinitionError]
);
useEffect(() => {

1
web/src/app/admin/tools/ToolsTable.tsx
View File

@ -1,7 +1,6 @@
"use client";
import {
Text,
Table,
TableHead,
TableRow,

1
web/src/app/admin/tools/edit/[toolId]/page.tsx
View File

@ -3,7 +3,6 @@ import { Card, Text, Title } from "@tremor/react";
import { ToolEditor } from "@/app/admin/tools/ToolEditor";
import { fetchToolByIdSS } from "@/lib/tools/fetchTools";
import { DeleteToolButton } from "./DeleteToolButton";
import { FiTool } from "react-icons/fi";
import { AdminPageTitle } from "@/components/admin/Title";
import { BackButton } from "@/components/BackButton";
import { ToolIcon } from "@/components/icons/icons";

1
web/src/app/admin/tools/new/page.tsx
View File

@ -5,7 +5,6 @@ import { BackButton } from "@/components/BackButton";
import { AdminPageTitle } from "@/components/admin/Title";
import { ToolIcon } from "@/components/icons/icons";
import { Card } from "@tremor/react";
import { FiTool } from "react-icons/fi";
export default function NewToolPage() {
return (

2
web/src/app/admin/tools/page.tsx
View File

@ -1,6 +1,6 @@
import { ToolsTable } from "./ToolsTable";
import { ToolSnapshot } from "@/lib/tools/interfaces";
import { FiPlusSquare, FiTool } from "react-icons/fi";
import { FiPlusSquare } from "react-icons/fi";
import Link from "next/link";
import { Divider, Text, Title } from "@tremor/react";
import { fetchSS } from "@/lib/utilsSS";

1
web/src/app/admin/users/page.tsx
View File

@ -12,7 +12,6 @@ import { AdminPageTitle } from "@/components/admin/Title";
import { usePopup, PopupSpec } from "@/components/admin/connectors/Popup";
import { UsersIcon } from "@/components/icons/icons";
import { errorHandlingFetcher } from "@/lib/fetcher";
import { type User, UserStatus } from "@/lib/types";
import useSWR, { mutate } from "swr";
import { ErrorCallout } from "@/components/ErrorCallout";
import { HidableSection } from "@/app/admin/assistants/HidableSection";

13
web/src/app/assistants/SidebarWrapper.tsx
View File

@ -6,7 +6,14 @@ import { Folder } from "@/app/chat/folders/interfaces";
import { User } from "@/lib/types";
import Cookies from "js-cookie";
import { SIDEBAR_TOGGLED_COOKIE_NAME } from "@/components/resizable/constants";
import { ReactNode, useContext, useEffect, useRef, useState } from "react";
import {
ReactNode,
useCallback,
useContext,
useEffect,
useRef,
useState,
} from "react";
import { useSidebarVisibility } from "@/components/chat_search/hooks";
import FunctionalHeader from "@/components/chat_search/Header";
import { useRouter } from "next/navigation";
@ -54,7 +61,7 @@ export default function SidebarWrapper<T extends object>({
}, 200);
};
const toggleSidebar = () => {
const toggleSidebar = useCallback(() => {
Cookies.set(
SIDEBAR_TOGGLED_COOKIE_NAME,
String(!toggledSidebar).toLocaleLowerCase()
@ -63,7 +70,7 @@ export default function SidebarWrapper<T extends object>({
path: "/",
};
setToggledSidebar((toggledSidebar) => !toggledSidebar);
};
}, [toggledSidebar]);
const sidebarElementRef = useRef<HTMLDivElement>(null);

1
web/src/app/assistants/gallery/AssistantsGallery.tsx
View File

@ -4,7 +4,6 @@ import { Persona } from "@/app/admin/assistants/interfaces";
import { AssistantIcon } from "@/components/assistants/AssistantIcon";
import { User } from "@/lib/types";
import { Button } from "@tremor/react";
import Link from "next/link";
import { useState } from "react";
import { FiList, FiMinus, FiPlus } from "react-icons/fi";
import { AssistantsPageTitle } from "../AssistantsPageTitle";

2
web/src/app/assistants/mine/AssistantSharingModal.tsx
View File

@ -1,7 +1,7 @@
import { useState } from "react";
import { Modal } from "@/components/Modal";
import { MinimalUserSnapshot, User } from "@/lib/types";
import { Button, Divider, Text } from "@tremor/react";
import { Button } from "@tremor/react";
import { FiPlus, FiX } from "react-icons/fi";
import { Persona } from "@/app/admin/assistants/interfaces";
import { SearchMultiSelectDropdown } from "@/components/Dropdown";

12
web/src/app/assistants/mine/AssistantsList.tsx
View File

@ -1,15 +1,9 @@
"use client";
import React, {
Dispatch,
ReactNode,
SetStateAction,
useEffect,
useState,
} from "react";
import React, { Dispatch, SetStateAction, useEffect, useState } from "react";
import { MinimalUserSnapshot, User } from "@/lib/types";
import { Persona } from "@/app/admin/assistants/interfaces";
import { Button, Divider, Text } from "@tremor/react";
import { Button, Divider } from "@tremor/react";
import {
FiEdit2,
FiList,
@ -51,8 +45,8 @@ import {
SortableContext,
sortableKeyboardCoordinates,
verticalListSortingStrategy,
useSortable,
} from "@dnd-kit/sortable";
import { useSortable } from "@dnd-kit/sortable";
import { DragHandle } from "@/components/table/DragHandle";
import {

1
web/src/app/assistants/mine/WrappedInputPrompts.tsx
View File

@ -5,7 +5,6 @@ import { Folder } from "@/app/chat/folders/interfaces";
import { Persona } from "@/app/admin/assistants/interfaces";
import { User } from "@/lib/types";
import { InstantSSRAutoRefresh } from "@/components/SSRAutoRefresh";
import { AssistantsPageTitle } from "../AssistantsPageTitle";
import { useInputPrompts } from "@/app/admin/prompt-library/hooks";
import { PromptSection } from "@/app/admin/prompt-library/promptSection";

3
web/src/app/auth/login/LoginText.tsx
View File

@ -1,7 +1,6 @@
"use client";
import React from "react";
import { useContext } from "react";
import React, { useContext } from "react";
import { SettingsContext } from "@/components/settings/SettingsProvider";
export const LoginText = () => {

8
web/src/app/auth/verify-email/Verify.tsx
View File

@ -2,7 +2,7 @@
import { HealthCheckBanner } from "@/components/health/healthcheck";
import { useRouter, useSearchParams } from "next/navigation";
import { useEffect, useState } from "react";
import { useCallback, useEffect, useState } from "react";
import { Text } from "@tremor/react";
import { RequestNewVerificationEmail } from "../waiting-on-verification/RequestNewVerificationEmail";
import { User } from "@/lib/types";
@ -14,7 +14,7 @@ export function Verify({ user }: { user: User | null }) {
const [error, setError] = useState("");
async function verify() {
const verify = useCallback(async () => {
const token = searchParams.get("token");
if (!token) {
setError(
@ -39,11 +39,11 @@ export function Verify({ user }: { user: User | null }) {
`Failed to verify your email - ${errorDetail}. Please try requesting a new verification email.`
);
}
}
}, [searchParams, router]);
useEffect(() => {
verify();
}, []);
}, [verify]);
return (
<main>

26
web/src/app/chat/ChatPage.tsx
View File

@ -123,7 +123,7 @@ export function ChatPage({
const router = useRouter();
const searchParams = useSearchParams();
let {
const {
chatSessions,
availableSources,
availableDocumentSets,
@ -243,7 +243,8 @@ export function ChatPage({
destructureValue(user?.preferences.default_model)
);
}
}, [liveAssistant]);
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [liveAssistant, llmProviders, user?.preferences.default_model]);
const stopGenerating = () => {
const currentSession = currentSessionId();
@ -436,6 +437,7 @@ export function ChatPage({
}
initialSessionFetch();
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [existingChatSessionId]);
const [message, setMessage] = useState(
@ -696,7 +698,7 @@ export function ChatPage({
finalAssistants.find((persona) => persona.id === defaultAssistantId)
);
}
}, [defaultAssistantId]);
}, [defaultAssistantId, finalAssistants, messageHistory.length]);
const [
selectedDocuments,
@ -772,7 +774,7 @@ export function ChatPage({
const handleInputResize = () => {
setTimeout(() => {
if (inputRef.current && lastMessageRef.current) {
let newHeight: number =
const newHeight: number =
inputRef.current?.getBoundingClientRect().height!;
const heightDifference = newHeight - previousHeight.current;
if (
@ -984,7 +986,7 @@ export function ChatPage({
setAlternativeGeneratingAssistant(alternativeAssistantOverride);
clientScrollToBottom();
let currChatSessionId: number;
let isNewSession = chatSessionIdRef.current === null;
const isNewSession = chatSessionIdRef.current === null;
const searchParamBasedChatSessionName =
searchParams.get(SEARCH_PARAM_NAMES.TITLE) || null;
@ -1067,7 +1069,7 @@ export function ChatPage({
let answer = "";
let stopReason: StreamStopReason | null = null;
const stopReason: StreamStopReason | null = null;
let query: string | null = null;
let retrievalType: RetrievalType =
selectedDocuments.length > 0
@ -1668,17 +1670,22 @@ export function ChatPage({
useEffect(() => {
initializeVisibleRange();
}, [router, messageHistory, chatSessionIdRef.current]);
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [router, messageHistory]);
useLayoutEffect(() => {
const scrollableDiv = scrollableDivRef.current;
const handleScroll = () => {
updateVisibleRangeBasedOnScroll();
};
scrollableDivRef.current?.addEventListener("scroll", handleScroll);
scrollableDiv?.addEventListener("scroll", handleScroll);
return () => {
scrollableDivRef.current?.removeEventListener("scroll", handleScroll);
scrollableDiv?.removeEventListener("scroll", handleScroll);
};
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [messageHistory]);
const currentVisibleRange = visibleRange.get(currentSessionId()) || {
@ -1728,6 +1735,7 @@ export function ChatPage({
return () => {
window.removeEventListener("keydown", handleKeyDown);
};
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [router]);
const [sharedChatSession, setSharedChatSession] =
useState<ChatSession | null>();

2
web/src/app/chat/ChatPopup.tsx
View File

@ -17,7 +17,7 @@ export function ChatPopup() {
setCompletedFlow(
localStorage.getItem(ALL_USERS_INITIAL_POPUP_FLOW_COMPLETED) === "true"
);
});
}, []);
const settings = useContext(SettingsContext);
const enterpriseSettings = settings?.enterpriseSettings;

1
web/src/app/chat/RegenerateOption.tsx
View File

@ -14,7 +14,6 @@ import { destructureValue, getFinalLLM, structureValue } from "@/lib/llm/utils";
import { useState } from "react";
import { Hoverable } from "@/components/Hoverable";
import { Popover } from "@/components/popover/Popover";
import { FiStar } from "react-icons/fi";
import { StarFeedback } from "@/components/icons/icons";
import { IconType } from "react-icons";

1
web/src/app/chat/documentSidebar/ChatDocumentDisplay.tsx
View File

@ -51,6 +51,7 @@ export function ChatDocumentDisplay({
"rounded-lg flex font-bold flex-shrink truncate" +
(document.link ? "" : "pointer-events-none")
}
rel="noreferrer"
>
{isInternet ? (
<InternetSearchIcon url={document.link} />

2
web/src/app/chat/documentSidebar/DocumentSidebar.tsx
View File

@ -3,7 +3,7 @@ import { Divider, Text } from "@tremor/react";
import { ChatDocumentDisplay } from "./ChatDocumentDisplay";
import { usePopup } from "@/components/admin/connectors/Popup";
import { removeDuplicateDocs } from "@/lib/documentUtils";
import { Message, RetrievalType } from "../interfaces";
import { Message } from "../interfaces";
import { ForwardedRef, forwardRef } from "react";
interface DocumentSidebarProps {

2
web/src/app/chat/files/InputBarPreview.tsx
View File

@ -1,5 +1,5 @@
import { useEffect, useRef, useState } from "react";
import { ChatFileType, FileDescriptor } from "../interfaces";
import { FileDescriptor } from "../interfaces";
import { FiX, FiLoader, FiFileText } from "react-icons/fi";
import { InputBarPreviewImage } from "./images/InputBarPreviewImage";

1
web/src/app/chat/files/images/InputBarPreviewImage.tsx
View File

@ -30,6 +30,7 @@ export function InputBarPreviewImage({ fileId }: { fileId: string }) {
`}
>
<img
alt="preview"
onClick={() => setFullImageShowing(true)}
className="h-8 w-8 object-cover rounded-lg bg-background cursor-pointer"
src={buildImgUrl(fileId)}

2
web/src/app/chat/folders/FolderManagement.tsx
View File

@ -1,5 +1,3 @@
import { useState, useEffect, FC } from "react";
// Function to create a new folder
export async function createFolder(folderName: string): Promise<number> {
const response = await fetch("/api/folder", {

2
web/src/app/chat/input/ChatInputBar.tsx
View File

@ -98,7 +98,7 @@ export function ChatInputBar({
MAX_INPUT_HEIGHT
)}px`;
}
}, [message]);
}, [message, textAreaRef]);
const handlePaste = (event: React.ClipboardEvent) => {
const items = event.clipboardData?.items;

6
web/src/app/chat/input/ChatInputOption.tsx
View File

@ -1,9 +1,5 @@
import React, { useState, useRef, useEffect } from "react";
import {
ChevronDownIcon,
ChevronRightIcon,
IconProps,
} from "@/components/icons/icons";
import { ChevronDownIcon, IconProps } from "@/components/icons/icons";
interface ChatInputOptionProps {
name?: string;

15
web/src/app/chat/lib.tsx
View File

@ -4,16 +4,9 @@ import {
Filters,
StreamStopInfo,
} from "@/lib/search/interfaces";
import { handleSSEStream, handleStream } from "@/lib/search/streamingUtils";
import { handleSSEStream } from "@/lib/search/streamingUtils";
import { ChatState, FeedbackType } from "./types";
import {
Dispatch,
MutableRefObject,
RefObject,
SetStateAction,
useEffect,
useRef,
} from "react";
import { MutableRefObject, RefObject, useEffect, useRef } from "react";
import {
BackendMessage,
ChatSession,
@ -664,7 +657,7 @@ export async function useScrollonStream({
useEffect(() => {
if (chatState != "input" && scrollableDivRef && scrollableDivRef.current) {
let newHeight: number = scrollableDivRef.current?.scrollTop!;
const newHeight: number = scrollableDivRef.current?.scrollTop!;
const heightDifference = newHeight - previousScroll.current;
previousScroll.current = newHeight;
@ -729,5 +722,5 @@ export async function useScrollonStream({
});
}
}
}, [chatState]);
}, [chatState, distance, scrollDist, scrollableDivRef]);
}

2
web/src/app/chat/message/ContinueMessage.tsx
View File

@ -1,6 +1,6 @@
import { EmphasizedClickable } from "@/components/BasicClickable";
import { useEffect, useState } from "react";
import { FiBook, FiPlayCircle } from "react-icons/fi";
import { FiPlayCircle } from "react-icons/fi";
export function ContinueGenerating({
handleContinueGenerating,

9
web/src/app/chat/message/Messages.tsx
View File

@ -202,7 +202,7 @@ export const AIMessage = ({
const selectedDocumentIds =
selectedDocuments?.map((document) => document.document_id) || [];
let citedDocumentIds: string[] = [];
const citedDocumentIds: string[] = [];
citedDocuments?.forEach((doc) => {
citedDocumentIds.push(doc[1].document_id);
@ -272,7 +272,7 @@ export const AIMessage = ({
);
},
}),
[messageId, content]
[finalContent]
);
const renderedMarkdown = useMemo(() => {
@ -286,7 +286,7 @@ export const AIMessage = ({
{finalContent as string}
</ReactMarkdown>
);
}, [finalContent]);
}, [finalContent, markdownComponents]);
const includeMessageSwitcher =
currentMessageInd !== undefined &&
@ -412,6 +412,7 @@ export const AIMessage = ({
href={doc.link || undefined}
target="_blank"
className="text-sm flex w-full pt-1 gap-x-1.5 overflow-hidden justify-between font-semibold text-text-700"
rel="noreferrer"
>
<Citation link={doc.link} index={ind + 1} />
<p className="shrink truncate ellipsis break-all">
@ -670,7 +671,7 @@ export const HumanMessage = ({
if (!isEditing) {
setEditedContent(content);
}
}, [content]);
}, [content, isEditing]);
useEffect(() => {
if (textareaRef.current) {

2
web/src/app/chat/message/SearchSummary.tsx
View File

@ -83,7 +83,7 @@ export function SearchSummary({
if (!isEditing) {
setFinalQuery(query);
}
}, [query]);
}, [query, isEditing]);
const searchingForDisplay = (
<div className={`flex p-1 rounded ${isOverflowed && "cursor-default"}`}>

2
web/src/app/chat/message/SkippedSearch.tsx
View File

@ -1,5 +1,5 @@
import { EmphasizedClickable } from "@/components/BasicClickable";
import { FiArchive, FiBook, FiSearch } from "react-icons/fi";
import { FiBook } from "react-icons/fi";
function ForceSearchButton({
messageId,

7
web/src/app/chat/modal/FeedbackModal.tsx
View File

@ -2,13 +2,8 @@
import { useState } from "react";
import { FeedbackType } from "../types";
import { FiThumbsDown, FiThumbsUp } from "react-icons/fi";
import { ModalWrapper } from "@/components/modals/ModalWrapper";
import {
DislikeFeedbackIcon,
FilledLikeIcon,
LikeFeedbackIcon,
} from "@/components/icons/icons";
import { FilledLikeIcon } from "@/components/icons/icons";
const predefinedPositiveFeedbackOptions =
process.env.NEXT_PUBLIC_POSITIVE_PREDEFINED_FEEDBACK_OPTIONS?.split(",") ||

4
web/src/app/chat/modal/SetDefaultModelModal.tsx
View File

@ -1,6 +1,6 @@
import { Dispatch, SetStateAction, useState, useEffect, useRef } from "react";
import { Dispatch, SetStateAction, useEffect, useRef } from "react";
import { ModalWrapper } from "@/components/modals/ModalWrapper";
import { Badge, Text } from "@tremor/react";
import { Text } from "@tremor/react";
import { getDisplayNameForModel, LlmOverride } from "@/lib/hooks";
import { LLMProviderDescriptor } from "@/app/admin/configuration/llm/interfaces";

3
web/src/app/chat/modal/ShareChatSessionModal.tsx
View File

@ -3,7 +3,7 @@ import { ModalWrapper } from "@/components/modals/ModalWrapper";
import { Button, Callout, Divider, Text } from "@tremor/react";
import { Spinner } from "@/components/Spinner";
import { ChatSessionSharedStatus } from "../interfaces";
import { FiCopy, FiX } from "react-icons/fi";
import { FiCopy } from "react-icons/fi";
import { CopyButton } from "@/components/CopyButton";
function buildShareLink(chatSessionId: number) {
@ -82,6 +82,7 @@ export function ShareChatSessionModal({
href={shareLink}
target="_blank"
className="underline text-link mt-1 ml-1 text-sm my-auto"
rel="noreferrer"
>
{shareLink}
</a>

1
web/src/app/chat/modal/configuration/AssistantsTab.tsx
View File

@ -19,7 +19,6 @@ import { getFinalLLM } from "@/lib/llm/utils";
import React, { useState } from "react";
import { updateUserAssistantList } from "@/lib/assistants/updateAssistantPreferences";
import { DraggableAssistantCard } from "@/components/assistants/AssistantCards";
import { useRouter } from "next/navigation";
export function AssistantsTab({
selectedAssistant,

20
web/src/app/chat/modal/configuration/LlmTab.tsx
View File

@ -1,14 +1,10 @@
import { useChatContext } from "@/components/context/ChatContext";
import { getDisplayNameForModel, LlmOverrideManager } from "@/lib/hooks";
import { LlmOverrideManager } from "@/lib/hooks";
import React, { forwardRef, useCallback, useState } from "react";
import { debounce } from "lodash";
import { Text } from "@tremor/react";
import { Persona } from "@/app/admin/assistants/interfaces";
import {
checkLLMSupportsImageInput,
destructureValue,
structureValue,
} from "@/lib/llm/utils";
import { destructureValue } from "@/lib/llm/utils";
import { updateModelOverrideForChatSession } from "../../lib";
import { GearIcon } from "@/components/icons/icons";
import { LlmList } from "@/components/llm/LLMList";
@ -44,12 +40,14 @@ export const LlmTab = forwardRef<HTMLDivElement, LlmTabProps>(
const [localTemperature, setLocalTemperature] = useState<number>(
temperature || 0
);
const debouncedSetTemperature = useCallback(
debounce((value) => {
setTemperature(value);
}, 300),
[]
(value: number) => {
const debouncedFunction = debounce((value: number) => {
setTemperature(value);
}, 300);
return debouncedFunction(value);
},
[setTemperature]
);
const handleTemperatureChange = (value: number) => {

2
web/src/app/chat/modifiers/SearchTypeSelector.tsx
View File

@ -1,7 +1,7 @@
import { BasicClickable } from "@/components/BasicClickable";
import { ControlledPopup, DefaultDropdownElement } from "@/components/Dropdown";
import { useState } from "react";
import { FiCpu, FiFilter, FiSearch } from "react-icons/fi";
import { FiCpu, FiSearch } from "react-icons/fi";
export const QA = "Question Answering";
export const SEARCH = "Search Only";

3
web/src/app/chat/modifiers/SelectedDocuments.tsx
View File

@ -1,7 +1,6 @@
import { BasicClickable } from "@/components/BasicClickable";
import { DanswerDocument } from "@/lib/search/interfaces";
import { useState } from "react";
import { FiBook, FiFilter } from "react-icons/fi";
import { FiBook } from "react-icons/fi";
export function SelectedDocuments({
selectedDocuments,

2
web/src/app/chat/page.tsx
View File

@ -5,8 +5,6 @@ import { WelcomeModal } from "@/components/initialSetup/welcome/WelcomeModalWrap
import { ChatProvider } from "@/components/context/ChatContext";
import { fetchChatData } from "@/lib/chat/fetchChatData";
import WrappedChat from "./WrappedChat";
import { ProviderContextProvider } from "@/components/chat_search/ProviderContext";
import { orderAssistantsForUser } from "@/lib/assistants/utils";
export default async function Page({
searchParams,

6
web/src/app/chat/sessionSidebar/ChatSessionDisplay.tsx
View File

@ -3,11 +3,7 @@
import { useRouter } from "next/navigation";
import { ChatSession } from "../interfaces";
import { useState, useEffect, useContext } from "react";
import {
deleteChatSession,
getChatRetentionInfo,
renameChatSession,
} from "../lib";
import { getChatRetentionInfo, renameChatSession } from "../lib";
import { BasicSelectable } from "@/components/BasicClickable";
import Link from "next/link";
import {

3
web/src/app/chat/sessionSidebar/HistorySidebar.tsx
View File

@ -1,7 +1,7 @@
"use client";
import { FiEdit, FiFolderPlus } from "react-icons/fi";
import { ForwardedRef, forwardRef, useContext, useState } from "react";
import React, { ForwardedRef, forwardRef, useContext, useState } from "react";
import Link from "next/link";
import { useRouter } from "next/navigation";
import { ChatSession } from "../interfaces";
@ -11,7 +11,6 @@ import { createFolder } from "../folders/FolderManagement";
import { usePopup } from "@/components/admin/connectors/Popup";
import { SettingsContext } from "@/components/settings/SettingsProvider";
import React from "react";
import {
AssistantsIconSkeleton,
ClosedBookIcon,

2
web/src/app/chat/sessionSidebar/PagesTab.tsx
View File

@ -7,7 +7,7 @@ import { Folder } from "../folders/interfaces";
import { CHAT_SESSION_ID_KEY, FOLDER_ID_KEY } from "@/lib/drag/constants";
import { usePopup } from "@/components/admin/connectors/Popup";
import { useRouter } from "next/navigation";
import { useEffect, useState } from "react";
import { useState } from "react";
import { pageType } from "./types";
export function PagesTab({

1
web/src/app/ee/admin/api-key/DanswerApiKeyForm.tsx
View File

@ -6,7 +6,6 @@ import {
} from "@/components/admin/connectors/Field";
import { createApiKey, updateApiKey } from "./lib";
import { Modal } from "@/components/Modal";
import { XIcon } from "@/components/icons/icons";
import { Button, Divider, Text } from "@tremor/react";
import { UserRole } from "@/lib/types";
import { APIKey } from "./types";

2
web/src/app/ee/admin/api-key/page.tsx
View File

@ -16,10 +16,10 @@ import {
TableRow,
Text,
Title,
Table,
} from "@tremor/react";
import { usePopup } from "@/components/admin/connectors/Popup";
import { useState } from "react";
import { Table } from "@tremor/react";
import { DeleteButton } from "@/components/DeleteButton";
import { FiCopy, FiEdit2, FiRefreshCw, FiX } from "react-icons/fi";
import { Modal } from "@/components/Modal";

2
web/src/app/ee/admin/groups/ConnectorEditor.tsx
View File

@ -19,7 +19,7 @@ export const ConnectorEditor = ({
.filter((ccPair) => !(ccPair.access_type === "public"))
.map((ccPair) => {
const ind = selectedCCPairIds.indexOf(ccPair.cc_pair_id);
let isSelected = ind !== -1;
const isSelected = ind !== -1;
return (
<div
key={`${ccPair.connector.id}-${ccPair.credential.id}`}

1
web/src/app/ee/admin/groups/UserEditor.tsx
View File

@ -1,5 +1,4 @@
import { User } from "@/lib/types";
import { useState } from "react";
import { FiPlus, FiX } from "react-icons/fi";
import { SearchMultiSelectDropdown } from "@/components/Dropdown";
import { UsersIcon } from "@/components/icons/icons";

2
web/src/app/ee/admin/groups/UserGroupCreationForm.tsx
View File

@ -3,12 +3,10 @@ import * as Yup from "yup";
import { PopupSpec } from "@/components/admin/connectors/Popup";
import { ConnectorIndexingStatus, User, UserGroup } from "@/lib/types";
import { TextFormField } from "@/components/admin/connectors/Field";
import { ConnectorTitle } from "@/components/admin/connectors/ConnectorTitle";
import { createUserGroup } from "./lib";
import { UserEditor } from "./UserEditor";
import { ConnectorEditor } from "./ConnectorEditor";
import { Modal } from "@/components/Modal";
import { XIcon } from "@/components/icons/icons";
import { Button, Divider } from "@tremor/react";
interface UserGroupCreationFormProps {

1
web/src/app/ee/admin/groups/[groupId]/AddConnectorForm.tsx
View File

@ -1,7 +1,6 @@
import { Button } from "@/components/Button";
import { SearchMultiSelectDropdown } from "@/components/Dropdown";
import { Modal } from "@/components/Modal";
import { UsersIcon } from "@/components/icons/icons";
import { useState } from "react";
import { FiPlus, FiX } from "react-icons/fi";
import { updateUserGroup } from "./lib";

1
web/src/app/ee/admin/groups/[groupId]/page.tsx
View File

@ -2,7 +2,6 @@
import { GroupsIcon } from "@/components/icons/icons";
import { GroupDisplay } from "./GroupDisplay";
import { FiAlertCircle, FiChevronLeft } from "react-icons/fi";
import { useSpecificUserGroup } from "./hook";
import { ThreeDotsLoader } from "@/components/Loading";
import { useConnectorCredentialIndexingStatus, useUsers } from "@/lib/hooks";

4
web/src/app/ee/admin/groups/page.tsx
View File

@ -4,9 +4,7 @@ import { GroupsIcon } from "@/components/icons/icons";
import { UserGroupsTable } from "./UserGroupsTable";
import { UserGroupCreationForm } from "./UserGroupCreationForm";
import { usePopup } from "@/components/admin/connectors/Popup";
import { useState, useEffect } from "react";
import { getCurrentUser } from "@/lib/user";
import { User, UserRole } from "@/lib/types";
import { useState } from "react";
import { ThreeDotsLoader } from "@/components/Loading";
import {
useConnectorCredentialIndexingStatus,

5
web/src/app/ee/admin/performance/query-history/QueryHistoryTable.tsx
View File

@ -9,9 +9,10 @@ import {
TableBody,
TableCell,
Text,
Divider,
Select,
SelectItem,
} from "@tremor/react";
import { Divider } from "@tremor/react";
import { Select, SelectItem } from "@tremor/react";
import { ThreeDotsLoader } from "@/components/Loading";
import { ChatSessionMinimal } from "../usage/types";
import { timestampToReadableDate } from "@/lib/dateUtils";

7
web/src/app/ee/admin/performance/query-history/[id]/page.tsx
View File

@ -30,7 +30,12 @@ function MessageDisplay({ message }: { message: MessageSnapshot }) {
}
/>
{document.link ? (
<a href={document.link} target="_blank" className="text-link">
<a
href={document.link}
target="_blank"
className="text-link"
rel="noreferrer"
>
{document.semantic_identifier}
</a>
) : (

4
web/src/app/ee/admin/performance/usage/UsageReports.tsx
View File

@ -16,9 +16,9 @@ import {
TableRow,
Text,
Title,
Button,
} from "@tremor/react";
import useSWR from "swr";
import { Button } from "@tremor/react";
import { useState } from "react";
import { UsageReport } from "./types";
import { ThreeDotsLoader } from "@/components/Loading";
@ -36,7 +36,7 @@ function GenerateReportInput() {
const [errorOccurred, setErrorOccurred] = useState<Error | null>(null);
const download = (bytes: Blob) => {
let elm = document.createElement("a");
const elm = document.createElement("a");
elm.href = URL.createObjectURL(bytes);
elm.setAttribute("download", "usage_reports.zip");
elm.click();

1
web/src/app/ee/admin/performance/usage/page.tsx
View File

@ -4,7 +4,6 @@ import { DateRangeSelector } from "../DateRangeSelector";
import { DanswerBotChart } from "./DanswerBotChart";
import { FeedbackChart } from "./FeedbackChart";
import { QueryPerformanceChart } from "./QueryPerformanceChart";
import { BarChartIcon } from "@/components/icons/icons";
import { useTimeRange } from "../lib";
import { AdminPageTitle } from "@/components/admin/Title";
import { FiActivity } from "react-icons/fi";

1
web/src/app/ee/admin/standard-answer/[id]/page.tsx
View File

@ -3,7 +3,6 @@ import { StandardAnswerCreationForm } from "@/app/ee/admin/standard-answer/Stand
import { fetchSS } from "@/lib/utilsSS";
import { ErrorCallout } from "@/components/ErrorCallout";
import { BackButton } from "@/components/BackButton";
import { Text } from "@tremor/react";
import { ClipboardIcon } from "@/components/icons/icons";
import { StandardAnswer, StandardAnswerCategory } from "@/lib/types";

1
web/src/app/ee/admin/standard-answer/new/page.tsx
View File

@ -3,7 +3,6 @@ import { StandardAnswerCreationForm } from "@/app/ee/admin/standard-answer/Stand
import { fetchSS } from "@/lib/utilsSS";
import { ErrorCallout } from "@/components/ErrorCallout";
import { BackButton } from "@/components/BackButton";
import { Text } from "@tremor/react";
import { ClipboardIcon } from "@/components/icons/icons";
import { StandardAnswerCategory } from "@/lib/types";

13
web/src/app/ee/admin/standard-answer/page.tsx
View File

@ -6,12 +6,10 @@ import { PopupSpec, usePopup } from "@/components/admin/connectors/Popup";
import { useStandardAnswers, useStandardAnswerCategories } from "./hooks";
import { ThreeDotsLoader } from "@/components/Loading";
import { ErrorCallout } from "@/components/ErrorCallout";
import { Button, Divider, Text } from "@tremor/react";
import Link from "next/link";
import { StandardAnswer, StandardAnswerCategory } from "@/lib/types";
import { MagnifyingGlass } from "@phosphor-icons/react";
import { useState } from "react";
import {
Button,
Divider,
Text,
Table,
TableHead,
TableRow,
@ -19,12 +17,15 @@ import {
TableBody,
TableCell,
} from "@tremor/react";
import Link from "next/link";
import { StandardAnswer, StandardAnswerCategory } from "@/lib/types";
import { MagnifyingGlass } from "@phosphor-icons/react";
import { useState } from "react";
import ReactMarkdown from "react-markdown";
import remarkGfm from "remark-gfm";
import { deleteStandardAnswer } from "./lib";
import { FilterDropdown } from "@/components/search/filtering/FilterDropdown";
import { FiTag } from "react-icons/fi";
import { SelectedBubble } from "@/components/search/filtering/Filters";
import { PageSelector } from "@/components/PageSelector";
import { CustomCheckbox } from "@/components/CustomCheckbox";

6
web/src/app/ee/admin/whitelabeling/ImageUpload.tsx
View File

@ -61,7 +61,11 @@ export function ImageUpload({
{tmpImageUrl && (
<div className="mt-4 mb-8">
<SubLabel>Uploaded Image:</SubLabel>
<img src={tmpImageUrl} className="mt-4 max-w-xs max-h-64" />
<img
alt="Uploaded Image"
src={tmpImageUrl}
className="mt-4 max-w-xs max-h-64"
/>
</div>
)}
</section>

Some files were not shown because too many files have changed in this diff Show More