TagSpaces is an offline, open source, document manager with tagging support
Ollama in renderer thread impl (#2234)
Stanimir6a50e4e2f97b
diff --git a/package-lock.json b/package-lock.jsonindex 327a863cc..5e018be03 100644--- a/package-lock.json+++ b/package-lock.json@@ -49,6 +49,7 @@"i18next-http-backend": "^2.2.2","leaflet": "^1.9.4","mgrs": "^1.0.0",+ "ollama": "^0.5.12","open-location-code": "^1.0.3","open-location-code-typescript": "^1.5.0","papaparse": "^5.4.1",@@ -86,7 +87,9 @@"url-regex-safe": "^4.0.0","use-state-with-callback": "^2.0.3","utif": "github:photopea/UTIF.js",- "uuid": "^9.0.0"+ "uuid": "^9.0.0",+ "zod": "^3.24.1",+ "zod-to-json-schema": "^3.24.1"},"devDependencies": {"@electron/notarize": "^2.3.2",@@ -199,7 +202,7 @@"yarn": "please-use-npm"},"optionalDependencies": {- "@tagspacespro/tagspacespro": "5.0.107"+ "@tagspacespro/tagspacespro": "5.0.108"}},"node_modules/@adobe/css-tools": {@@ -15880,9 +15883,9 @@}},"node_modules/@tagspacespro/tagspacespro": {- "version": "5.0.107",- "resolved": "https://npm.pkg.github.com/download/@tagspacespro/tagspacespro/5.0.107/6958104df587ded89cecd9a01b29d72f32ae1f43",- "integrity": "sha512-W8CdexFBlJbBlgCqsdlyshkJQw2/dZhGDLYWAZxE8+E5UhGpgFvPXw2zILkGpzqtYFtH60lHGfqBsbvGrUk/Sw==",+ "version": "5.0.108",+ "resolved": "https://npm.pkg.github.com/download/@tagspacespro/tagspacespro/5.0.108/e3e6c01bb629ad0e5a9caba5cce1a281b97c9e25",+ "integrity": "sha512-KdBu+Bdww0tSOL5V90ZMxXgxKZ5ly/o37d17teHZft3I+hlR11pQvPRINS8wGSGk/Ck4VZBRgetyYAfXFz0PUg==","license": "Proprietary","optional": true},@@ -40691,6 +40694,15 @@"dev": true,"license": "MIT"},+ "node_modules/ollama": {+ "version": "0.5.12",+ "resolved": "https://registry.npmjs.org/ollama/-/ollama-0.5.12.tgz",+ "integrity": "sha512-flVH1fn1c9NF7VV3bW9kSu0E+bYc40b4DxL/gS2Debhao35osJFRDiPOj9sIWTMvcyj78Paw1OuhfIe7uhDWfQ==",+ "license": "MIT",+ "dependencies": {+ "whatwg-fetch": "^3.6.20"+ }+ },"node_modules/on-finished": {"version": "2.4.1","license": "MIT",@@ -49312,8 +49324,7 @@},"node_modules/whatwg-fetch": {"version": "3.6.20",- "license": "MIT",- "peer": true+ "license": "MIT"},"node_modules/whatwg-mimetype": {"version": "2.3.0",@@ -49911,13 +49922,23 @@}},"node_modules/zod": {- "version": "3.23.8",- "dev": true,+ "version": "3.24.1",+ "resolved": "https://registry.npmjs.org/zod/-/zod-3.24.1.tgz",+ "integrity": "sha512-muH7gBL9sI1nciMZV67X5fTKKBLtwpZ5VBp1vsOQzj1MhrBZ4wlVCm3gedKZWLp0Oyel8sIGfeiz54Su+OVT+A==","license": "MIT","funding": {"url": "https://github.com/sponsors/colinhacks"}},+ "node_modules/zod-to-json-schema": {+ "version": "3.24.1",+ "resolved": "https://registry.npmjs.org/zod-to-json-schema/-/zod-to-json-schema-3.24.1.tgz",+ "integrity": "sha512-3h08nf3Vw3Wl3PK+q3ow/lIil81IT2Oa7YpQyUUDsEWbXveMesdfK1xBd2RhCkynwZndAxixji/7SYJJowr62w==",+ "license": "ISC",+ "peerDependencies": {+ "zod": "^3.24.1"+ }+ },"node_modules/zrender": {"version": "5.6.1","resolved": "https://registry.npmjs.org/zrender/-/zrender-5.6.1.tgz",diff --git a/package.json b/package.jsonindex 715e0d1c5..124b203d2 100644--- a/package.json+++ b/package.json@@ -195,6 +195,7 @@"i18next-http-backend": "^2.2.2","leaflet": "^1.9.4","mgrs": "^1.0.0",+ "ollama": "^0.5.12","open-location-code": "^1.0.3","open-location-code-typescript": "^1.5.0","papaparse": "^5.4.1",@@ -232,10 +233,12 @@"url-regex-safe": "^4.0.0","use-state-with-callback": "^2.0.3","utif": "github:photopea/UTIF.js",- "uuid": "^9.0.0"+ "uuid": "^9.0.0",+ "zod": "^3.24.1",+ "zod-to-json-schema": "^3.24.1"},"optionalDependencies": {- "@tagspacespro/tagspacespro": "5.0.107"+ "@tagspacespro/tagspacespro": "5.0.108"},"devDependencies": {"@electron/notarize": "^2.3.2",diff --git a/src/main/mainEvents.ts b/src/main/mainEvents.tsindex 490d76d95..660d73006 100644--- a/src/main/mainEvents.ts+++ b/src/main/mainEvents.ts@@ -250,15 +250,17 @@ export default function loadMainEvents() {});ipcMain.handle('getOllamaModels', async (event, ollamaApiUrl) => {- try {+ console.log('Currently Ollama main thread deactivated!');+ /*try {const apiResponse = await ollamaGetRequest('/api/tags', ollamaApiUrl);return (apiResponse as ApiResponse).models;} catch (e) {return undefined;- }+ }*/});ipcMain.handle('newOllamaMessage', async (event, ollamaApiUrl, msg) => {- const apiResponse = await ollamaPostRequest(+ console.log('Currently Ollama main thread deactivated!');+ /*const apiResponse = await ollamaPostRequest(JSON.stringify(msg),'/api/chat',ollamaApiUrl,@@ -273,10 +275,11 @@ export default function loadMainEvents() {}},);- return apiResponse;+ return apiResponse;*/});ipcMain.handle('pullOllamaModel', async (event, ollamaApiUrl, msg) => {- let lastPercents = 0;+ console.log('Currently Ollama main thread deactivated!');+ /*let lastPercents = 0;const apiResponse = await ollamaPostRequest(JSON.stringify(msg),'/api/pull',@@ -302,10 +305,11 @@ export default function loadMainEvents() {}},);- return apiResponse;+ return apiResponse;*/});ipcMain.handle('deleteOllamaModel', async (event, ollamaApiUrl, msg) => {- const apiResponse = await ollamaDeleteRequest(+ console.log('Currently Ollama main thread deactivated!');+ /*const apiResponse = await ollamaDeleteRequest(JSON.stringify(msg),'/api/delete',ollamaApiUrl,@@ -318,7 +322,7 @@ export default function loadMainEvents() {}},);- return apiResponse;+ return apiResponse;*/});ipcMain.handle('copyFilePromiseOverwrite',diff --git a/src/main/types.ts b/src/main/types.tsindex d53f1b1c3..471ae5f39 100644--- a/src/main/types.ts+++ b/src/main/types.ts@@ -1,5 +1,5 @@import { TS } from '-/tagspaces.namespace';-import { Model } from '-/components/chat/ChatTypes';+//import { Model } from '-/components/chat/ChatTypes';export interface Extensions {extensions: TS.Extension[];@@ -7,5 +7,5 @@ export interface Extensions {}export interface ApiResponse {- models: Model[];+ //models: Model[];}diff --git a/src/renderer/components/FolderContainer.tsx b/src/renderer/components/FolderContainer.tsxindex c50440c72..6714d3c2d 100644--- a/src/renderer/components/FolderContainer.tsx+++ b/src/renderer/components/FolderContainer.tsx@@ -357,7 +357,7 @@ function FolderContainer(props: Props) {}}>{perspectiveToggleButtons}- {AppConfig.isElectron && aiDefaultProvider && (+ {aiDefaultProvider && (<ToggleButtonvalue=""aria-label="chat-label"diff --git a/src/renderer/components/chat/AiGenDescButton.tsx b/src/renderer/components/chat/AiGenDescButton.tsxindex 88e814156..84550077c 100644--- a/src/renderer/components/chat/AiGenDescButton.tsx+++ b/src/renderer/components/chat/AiGenDescButton.tsx@@ -28,9 +28,13 @@ import { extractFileExtension } from '@tagspaces/tagspaces-common/paths';import { useState } from 'react';import { useTranslation } from 'react-i18next';import { AIIcon } from '../CommonIcons';-import { actions as SettingsActions } from '-/reducers/settings';+import {+ actions as SettingsActions,+ getDefaultAIProvider,+} from '-/reducers/settings';import { AppDispatch } from '-/reducers/app';-import { useDispatch } from 'react-redux';+import { useDispatch, useSelector } from 'react-redux';+import { AIProvider } from '-/components/chat/ChatTypes';type Props = TSButtonProps & {};@@ -38,13 +42,15 @@ function AiGenDescButton(props: Props) {const { t } = useTranslation();const { style, disabled } = props;const dispatch: AppDispatch = useDispatch();+ const defaultAiProvider: AIProvider = useSelector(getDefaultAIProvider);const { openedEntry } = useOpenedEntryContext();- const { generate, openedEntryModel } = useChatContext();+ const { generate, getEntryModel } = useChatContext();const { setDescription, saveDescription } = useFilePropertiesContext();const { showNotification } = useNotificationContext();const [isLoading, setIsLoading] = useState<boolean>(false);+ const openedEntryModel = getEntryModel(openedEntry.name, defaultAiProvider);if (!openedEntry ||!openedEntryModel ||@@ -92,13 +98,19 @@ function AiGenDescButton(props: Props) {onClick={() => {setIsLoading(true);if (AppConfig.aiSupportedFiletypes.image.includes(ext)) {- generate('image', 'description').then((results) =>- handleGenerationResults(results),- );+ generate(+ 'image',+ 'description',+ openedEntryModel.name,+ openedEntry,+ ).then((results) => handleGenerationResults(results));} else if (AppConfig.aiSupportedFiletypes.text.includes(ext)) {- generate(ext === 'pdf' ? 'image' : 'text', 'summary').then(- (results) => handleGenerationResults(results),- );+ generate(+ ext === 'pdf' ? 'image' : 'text',+ 'summary',+ openedEntryModel.name,+ openedEntry,+ ).then((results) => handleGenerationResults(results));}}}>diff --git a/src/renderer/components/chat/AiGenTagsButton.tsx b/src/renderer/components/chat/AiGenTagsButton.tsxindex e0cccb650..a7fcb2598 100644--- a/src/renderer/components/chat/AiGenTagsButton.tsx+++ b/src/renderer/components/chat/AiGenTagsButton.tsx@@ -46,61 +46,120 @@ type Props = TSButtonProps & {'text' | 'outlined' | 'contained',ButtonPropsVariantOverrides>;+ entries?: TS.FileSystemEntry[];fromDescription?: boolean;+ generationCompleted?: () => void;+ disabled?: boolean;};function AiGenTagsButton(props: Props) {- const { fromDescription, variant, style, disabled } = props;+ const {+ fromDescription,+ variant,+ style,+ disabled,+ entries,+ generationCompleted,+ } = props;const { t } = useTranslation();const dispatch: AppDispatch = useDispatch();const { openedEntry } = useOpenedEntryContext();const defaultAiProvider: AIProvider = useSelector(getDefaultAIProvider);const defaultBackgroundColor = useSelector(getTagColor);const defaultTextColor = useSelector(getTagTextColor);- const { generate, openedEntryModel, newChatMessage } = useChatContext();+ const { generate, newChatMessage, getEntryModel } = useChatContext();const { addTagsToFsEntry } = useTaggingActionsContext();const { showNotification } = useNotificationContext();const [isLoading, setIsLoading] = useState<boolean>(false);- if (- !openedEntry ||- !openedEntryModel ||- ![+ let generateEntries: TS.FileSystemEntry[] = entries;+ if (!generateEntries && openedEntry) {+ generateEntries = [openedEntry];+ }++ const extensionSupported = generateEntries.every((entry) =>+ [...AppConfig.aiSupportedFiletypes.text,...AppConfig.aiSupportedFiletypes.image,- ].includes(openedEntry.extension)- ) {+ ].includes(entry.extension),+ );++ if (!generateEntries || !defaultAiProvider || !extensionSupported) {return null;}- const ext = extractFileExtension(openedEntry.name).toLowerCase();+ const handleGeneration = () => {+ const promises = generateEntries.map((entry) => {+ const entryModel = getEntryModel(entry.name, defaultAiProvider);+ const ext = extractFileExtension(entry.name).toLowerCase();+ setIsLoading(true);+ if (fromDescription && entry.meta.description) {+ return newChatMessage(+ entry.meta.description,+ false,+ 'user',+ 'tags',+ defaultAiProvider.defaultTextModel,+ false,+ [],+ false,+ ).then((results) => handleGenerationResults(entry, results));+ } else if (AppConfig.aiSupportedFiletypes.image.includes(ext)) {+ return generate('image', 'tags', entryModel.name, entry).then(+ (results) => handleGenerationResults(entry, results),+ );+ } else if (AppConfig.aiSupportedFiletypes.text.includes(ext)) {+ return generate('text', 'tags', entryModel.name, entry).then(+ (results) => handleGenerationResults(entry, results),+ );+ }+ return Promise.resolve(false);+ });+ Promise.all(promises).then(() => {+ showNotification('Tags generated by an AI.');+ if (generationCompleted) {+ generationCompleted();+ }+ });+ };- function handleGenerationResults(response) {+ function handleGenerationResults(entry, response): Promise<boolean> {console.log('newOllamaMessage response:' + response);setIsLoading(false);if (response) {try {- const regex = /\{([^}]+)\}/g;+ const tags: TS.Tag[] = response.map((tag) => {+ const tagTitle = tag.toLowerCase().split(' ')[0];+ return {+ title: tagTitle,+ ...getTagColors(tagTitle, defaultTextColor, defaultBackgroundColor),+ };+ });+ const uniqueTags = tags.filter(+ (tag, index, self) =>+ index === self.findIndex((o) => o.title === tag.title),+ );+ /* const regex = /\{([^}]+)\}/g;const tags: TS.Tag[] = [...response.matchAll(regex)].map((match) => {const tagTitle = match[1].trim().replace(/^,|,$/g, '').toLowerCase();return {title: tagTitle,...getTagColors(tagTitle, defaultTextColor, defaultBackgroundColor),};- });- addTagsToFsEntry(openedEntry, tags).then(() =>+ });*/+ return addTagsToFsEntry(entry, uniqueTags).then(() => {dispatch(SettingsActions.setEntryContainerTab(TabNames.propertiesTab),- ),- );- showNotification(- 'Tags for ' + openedEntry.name + ' generated by an AI.',- );+ );+ return true;+ });+ // showNotification('Tags for ' + entry.name + ' generated by an AI.');} catch (e) {console.error('parse response ' + response, e);}}+ return Promise.resolve(false);}return (@@ -111,29 +170,7 @@ function AiGenTagsButton(props: Props) {startIcon={<AIIcon />}style={style}data-tid="generateTagsAITID"- onClick={() => {- setIsLoading(true);- if (fromDescription && openedEntry.meta.description) {- newChatMessage(- openedEntry.meta.description,- false,- 'user',- 'tags',- defaultAiProvider.defaultTextModel,- false,- [],- false,- ).then((results) => handleGenerationResults(results));- } else if (AppConfig.aiSupportedFiletypes.image.includes(ext)) {- generate('image', 'tags').then((results) =>- handleGenerationResults(results),- );- } else if (AppConfig.aiSupportedFiletypes.text.includes(ext)) {- generate('text', 'tags').then((results) =>- handleGenerationResults(results),- );- }- }}+ onClick={handleGeneration}variant={variant}>{t(diff --git a/src/renderer/components/chat/ChatDndTargetFile.tsx b/src/renderer/components/chat/ChatDndTargetFile.tsxindex 73decdbf9..9fbdb5b9b 100644--- a/src/renderer/components/chat/ChatDndTargetFile.tsx+++ b/src/renderer/components/chat/ChatDndTargetFile.tsx@@ -47,6 +47,22 @@ function ChatDndTargetFile(props: Props) {//const { findLocalLocation } = useCurrentLocationContext();const { setImages } = useChatContext();+ function isSupportedImageFormat(filePath: string) {+ const aiSupportedImages = [+ 'jpeg',+ 'jpg',+ 'png',+ 'gif',+ 'bmp',+ 'tiff',+ // 'avif', // currently not supported+ // 'webp', // currently not supported+ ];+ return aiSupportedImages.some((ext) =>+ filePath.toLowerCase().endsWith(ext),+ );+ }+const [collectedProps, drop] = useDrop<DragItem, unknown, DragProps>(() => ({accept: accepts,@@ -69,15 +85,12 @@ function ChatDndTargetFile(props: Props) {const arrPath = [];if (selectedEntries && selectedEntries.length > 0) {selectedEntries.map((entry) => {- if (entry.path.endsWith('.jpg') || entry.path.endsWith('.jpeg')) {+ if (isSupportedImageFormat(entry.path)) {arrPath.push(entry.path);}return true;});- } else if (- (path && path.endsWith('.jpg')) ||- path.endsWith('.jpeg')- ) {+ } else if (isSupportedImageFormat(path)) {arrPath.push(path);}setImages(arrPath);diff --git a/src/renderer/components/chat/ChatTypes.ts b/src/renderer/components/chat/ChatTypes.tsindex 696c19359..0d6e234a9 100644--- a/src/renderer/components/chat/ChatTypes.ts+++ b/src/renderer/components/chat/ChatTypes.ts@@ -36,14 +36,14 @@ export type AIProvider = {defaultTextModel?: string;};-export type Model = {+/*export type Model = {name: string;engine: AIProviders;modified_at?: string;size?: number;digest?: string;details?: ModelDetails;-};+};*/export type ChatItem = {request: string;diff --git a/src/renderer/components/chat/ChatView.tsx b/src/renderer/components/chat/ChatView.tsxindex a70a14bfc..d04295ab8 100644--- a/src/renderer/components/chat/ChatView.tsx+++ b/src/renderer/components/chat/ChatView.tsx@@ -37,6 +37,7 @@ import MoreVertIcon from '@mui/icons-material/MoreVert';import SendIcon from '@mui/icons-material/Send';import { Box, Grid2, MenuItem } from '@mui/material';import CircularProgress from '@mui/material/CircularProgress';+import CancelIcon from '@mui/icons-material/Cancel';import FormControl from '@mui/material/FormControl';import FormHelperText from '@mui/material/FormHelperText';import IconButton from '@mui/material/IconButton';@@ -64,18 +65,17 @@ function ChatView() {images,removeImage,chatHistoryItems,- addTimeLineResponse,- unloadCurrentModel,newChatMessage,changeCurrentModel,setModel,currentModel,getHistoryFilePath,deleteHistory,+ isTyping,+ cancelMessage,} = useChatContext();const { showNotification } = useNotificationContext();const aiDefaultProvider: AIProvider = useSelector(getDefaultAIProvider);- const isTyping = useRef<boolean>(false);const isLoading = useRef<boolean>(false);const currentMode = useRef<ChatMode>(undefined);const editorRef = useRef<MilkdownRef>(null);@@ -93,24 +93,24 @@ function ChatView() {return ''; // Return an empty string if newText does not start with oldText};*/- const chatMessageHandler = useMemo(() => {+ /*const chatMessageHandler = useMemo(() => {return (msg, replace): void => {//console.log(`Chat ${msg}`);const items = addTimeLineResponse(msg, replace);if (editorRef.current) {const newMarkdown = formatChatItems(items);- /*const oldMarkdown = editorRef.current.getMarkdown();- editorRef.current.insert(getAddedText(oldMarkdown, newMarkdown));*/ // insert and preserve selection+ /!*const oldMarkdown = editorRef.current.getMarkdown();+ editorRef.current.insert(getAddedText(oldMarkdown, newMarkdown));*!/ // insert and preserve selectioneditorRef.current.update(newMarkdown);}};- }, []);+ }, []);*/useEffect(() => {editorRef.current?.setDarkMode(theme.palette.mode === 'dark');}, [theme]);- useEffect(() => {+ /*useEffect(() => {if (AppConfig.isElectron) {window.electronIO.ipcRenderer.on('ChatMessage', (message, replace) => {//console.log('ChatMessage:' + message);@@ -136,7 +136,7 @@ function ChatView() {unloadCurrentModel();};}- }, [chatMessageHandler]);+ }, [chatMessageHandler]);*/const handleInputChange = (event: ChangeEvent<HTMLInputElement>) => {chatMsg.current = event.target.value;@@ -208,19 +208,32 @@ function ChatView() {};const handleChatMessage = () => {- isTyping.current = true;+ //isTyping.current = true;isLoading.current = true;forceUpdate();- newChatMessage(chatMsg.current, false, 'user', currentMode.current).then(- (response) => {+ newChatMessage(+ chatMsg.current,+ false,+ 'user',+ currentMode.current,+ undefined,+ true,+ )+ .then((response) => {console.log('newOllamaMessage response:' + response);if (response) {chatMsg.current = '';}- isTyping.current = false;+ isLoading.current = false;forceUpdate();- },- );+ })+ .catch((error) => {+ if (error.name === 'AbortError') {+ console.log('ChatMessage request has been aborted');+ } else {+ console.error('An error occurred:', error);+ }+ });};const handleMoreClick = (event: React.MouseEvent<HTMLElement>) => {@@ -314,6 +327,7 @@ function ChatView() {<SelectChatModelid="chatModelId"handleChangeModel={handleChangeModel}+ aiProvider={aiDefaultProvider}chosenModel={currentModel?.name}label={t('core:selectedAIModel')}/>@@ -404,7 +418,7 @@ function ChatView() {<FormControl fullWidth><TsTextFieldautoFocus- disabled={isTyping.current}+ disabled={isTyping || isLoading.current}name="entryName"//label={t('core:newChatMessage')}placeholder={t('core:yourMessageForAI')}@@ -428,9 +442,22 @@ function ChatView() {),endAdornment: (<InputAdornment position="end" style={{ height: 32 }}>- {isLoading.current && (+ {isTyping && (<CircularProgress size={24} color="inherit" />)}+ {isLoading.current && (+ <Tooltip title="Cancel Message">+ <IconButton+ onClick={() => {+ isLoading.current = false;+ cancelMessage();+ }}+ size="large"+ >+ <CancelIcon />+ </IconButton>+ </Tooltip>+ )}<Tooltip title="Send Message"><IconButtononClick={handleChatMessage}diff --git a/src/renderer/components/chat/OllamaClient.ts b/src/renderer/components/chat/OllamaClient.tsnew file mode 100644index 000000000..c9fc9eb6a--- /dev/null+++ b/src/renderer/components/chat/OllamaClient.ts@@ -0,0 +1,99 @@+import {+ Ollama,+ ListResponse,+ ModelResponse,+ ChatRequest,+ ChatResponse,+ ProgressResponse,+ StatusResponse,+} from 'ollama';++export async function getOllamaModels(+ ollama: Ollama,+): Promise<ModelResponse[]> {+ //'http://localhost:11434'+ //const ollama = new Ollama({ host: ollamaApiUrl });+ if (ollama) {+ try {+ const response: ListResponse = await ollama.list();+ if (response) {+ return response.models;+ }+ } catch (e) {+ console.log('getOllamaModels', e);+ }+ }+ return undefined;+}++export async function deleteOllamaModel(+ ollama: Ollama,+ model: string,+): Promise<string> {+ if (ollama) {+ const response: StatusResponse = await ollama.delete({ model });+ return response.status;+ }+ return '';+}++export async function pullOllamaModel(+ ollama: Ollama,+ model: string,+ progress: (part: any) => void,+): Promise<boolean> {+ if (ollama) {+ let lastPercents = 0;+ const stream = await ollama.pull({ model: model, stream: true });+ for await (const part of stream) {+ if (part.digest) {+ let percent = 0;+ if (part.completed && part.total) {+ percent = Math.round((part.completed / part.total) * 100);+ }+ if (lastPercents !== percent) {+ progress({ ...part, model });+ lastPercents = percent;+ }+ /*if (percent === 100) {+ console.log('Download completed ' + model);+ }*/+ } else {+ console.log(part.status);+ //progress(part);+ }+ }+ return true;+ }+ return false;+}++export async function newOllamaMessage(+ ollama: Ollama,+ msg: ChatRequest,+ chatMessageHandler?: (msgContent: string) => void,+): Promise<string | undefined> {+ //const ollama = new Ollama({ host: ollamaApiUrl });+ if (ollama) {+ if (msg.stream) {+ // Handle the case where `stream` is true+ return ollama+ .chat(msg as ChatRequest & { stream: true })+ .then(async (response) => {+ if (chatMessageHandler) {+ for await (const part of response) {+ chatMessageHandler(part.message.content);+ }+ }+ return undefined; // Return undefined for the streaming case if there's no final message content+ });+ } else {+ // Handle the case where `stream` is false or undefined+ const response: ChatResponse = await ollama.chat(+ msg as ChatRequest & { stream?: false },+ );+ return response.message.content;+ }+ }+ return undefined;+}diff --git a/src/renderer/components/chat/SelectChatModel.tsx b/src/renderer/components/chat/SelectChatModel.tsxindex 41e317480..8a705c938 100644--- a/src/renderer/components/chat/SelectChatModel.tsx+++ b/src/renderer/components/chat/SelectChatModel.tsx@@ -18,84 +18,171 @@import { AIIcon, RemoveIcon } from '-/components/CommonIcons';import TsSelect from '-/components/TsSelect';-import { Model } from '-/components/chat/ChatTypes';import ConfirmDialog from '-/components/dialogs/ConfirmDialog';import { useChatContext } from '-/hooks/useChatContext';import DownloadIcon from '@mui/icons-material/Download';import { ListItemIcon, MenuItem } from '@mui/material';import IconButton from '@mui/material/IconButton';import InputAdornment from '@mui/material/InputAdornment';-import { ChangeEvent, useState } from 'react';+import { ChangeEvent, useEffect, useState } from 'react';import { useTranslation } from 'react-i18next';+import { ModelResponse } from 'ollama';+import { parseISO, format } from 'date-fns';+import { AIProvider } from '-/components/chat/ChatTypes';+import { getOllamaModels } from '-/components/chat/OllamaClient';+import { useSelector } from 'react-redux';+import { getDefaultAIProvider } from '-/reducers/settings';interface Props {id?: string;label?: string;disabled?: boolean;+ aiProvider: AIProvider;chosenModel: string;handleChangeModel: (newModelName: string) => void;}function SelectChatModel(props: Props) {const { t } = useTranslation();- const { id, label, chosenModel, handleChangeModel, disabled } = props;- const { models, removeModel } = useChatContext();+ const { id, label, aiProvider, chosenModel, handleChangeModel, disabled } =+ props;+ const { removeModel, getOllamaClient, models } = useChatContext();++ const defaultAiProvider: AIProvider = useSelector(getDefaultAIProvider);const [isCustomModelPromptDialogOpened, setCustomModelPromptDialogOpened] =useState(false);+ const [installedModels, setModels] = useState(+ aiProvider?.id === defaultAiProvider?.id ? models : [],+ );++ useEffect(() => {+ if (aiProvider && aiProvider.engine === 'ollama') {+ getOllamaClient(aiProvider.url).then((client) => {+ getOllamaModels(client).then((m) => {+ if (!m || JSON.stringify(m) !== JSON.stringify(installedModels)) {+ setModels(m ? m : []);+ }+ });+ });+ }+ }, [aiProvider, models]);- const ollamaAvailableModels: Model[] = [+ const ollamaAvailableModels: ModelResponse[] = [{name: 'llama3.1',- engine: 'ollama',+ modified_at: new Date(),+ size: 1,+ digest: '',+ expires_at: new Date(),+ size_vram: 0,details: {+ family: 'ollama',format:'4,6 GB. The largest language model from Meta, featuring 405 billion parameters. It is one of the leading open-source AI models, capable of understanding and processing information deeply and diversely',+ parent_model: 'ollama',+ families: ['ollama'],+ parameter_size: '',+ quantization_level: '',},},{name: 'llama3.2',- engine: 'ollama',+ modified_at: new Date(),+ size: 1,+ digest: '',+ expires_at: new Date(),+ size_vram: 0,details: {+ family: 'ollama',format:'new 1B and 3B lightweight models are designed for seamless integration on mobile and edge devices. With these models, you can build private, personalized AI experiences with minimal latency and resource overhead.',+ parent_model: 'ollama',+ families: ['ollama'],+ parameter_size: '',+ quantization_level: '',},},{name: 'llama3.2-vision:11b',- engine: 'ollama',+ modified_at: new Date(),+ size: 1,+ digest: '',+ expires_at: new Date(),+ size_vram: 0,details: {+ family: 'ollama',format: 'requires least 8GB of VRAM.',+ parent_model: 'ollama',+ families: ['ollama'],+ parameter_size: '',+ quantization_level: '',},},{name: 'gemma2',- engine: 'ollama',+ modified_at: new Date(),+ size: 1,+ digest: '',+ expires_at: new Date(),+ size_vram: 0,details: {+ family: 'ollama',format:"5,4 GB. One of GEMMA2's standout features is its ability to handle and integrate multiple data modalities. Traditional AI models often specialise in a single type of data — text, images, or audio. GEMMA2, however, can process and synthesise information from all these sources simultaneously.",+ parent_model: 'ollama',+ families: ['ollama'],+ parameter_size: '',+ quantization_level: '',},},{name: 'codegemma',- engine: 'ollama',+ modified_at: new Date(),+ size: 1,+ digest: '',+ expires_at: new Date(),+ size_vram: 0,details: {+ family: 'ollama',format:'CodeGemma models are text-to-text and text-to-code decoder-only models and are available as a 7 billion pretrained variant that specializes in code completion and code generation tasks, a 7 billion parameter instruction-tuned variant for code chat and instruction following and a 2 billion parameter pretrained variant.',+ parent_model: 'ollama',+ families: ['ollama'],+ parameter_size: '',+ quantization_level: '',},},{name: 'llava',- engine: 'ollama',+ modified_at: new Date(),+ size: 1,+ digest: '',+ expires_at: new Date(),+ size_vram: 0,details: {+ family: 'ollama',format:'large multimodal model that is designed to understand and generate content based on both visual inputs (images) and textual instructions.',+ parent_model: 'ollama',+ families: ['ollama'],+ parameter_size: '',+ quantization_level: '',},},{name: 'tinyllama',- engine: 'ollama',+ modified_at: new Date(),+ size: 1,+ digest: '',+ expires_at: new Date(),+ size_vram: 0,details: {+ family: 'ollama',format: 'TinyLlama is a compact model with only 1.1B parameters.',+ parent_model: 'ollama',+ families: ['ollama'],+ parameter_size: '',+ quantization_level: '',},},];@@ -111,6 +198,9 @@ function SelectChatModel(props: Props) {const handleRemoveModel = () => {removeModel(chosenModel);};+ function getTitle(model) {+ return model ? format(parseISO(model.modified_at), 'yyyy-MM-dd') : '';+ }return (<>@@ -143,12 +233,12 @@ function SelectChatModel(props: Props) {<MenuItem value="" disabled>{t('core:installedAIModel')}</MenuItem>- {models && models.length > 0 ? (- models.map((model) => (+ {installedModels && installedModels.length > 0 ? (+ installedModels.map((model) => (<MenuItemkey={model.name}value={model.name}- title={model.modified_at}+ title={getTitle(model)}>{' '}<ListItemIcon>diff --git a/src/renderer/components/dialogs/AddRemoveTagsDialog.tsx b/src/renderer/components/dialogs/AddRemoveTagsDialog.tsxindex a454859b0..7955e9f56 100644--- a/src/renderer/components/dialogs/AddRemoveTagsDialog.tsx+++ b/src/renderer/components/dialogs/AddRemoveTagsDialog.tsx@@ -39,9 +39,11 @@ import {extractDirectoryName,extractFileName,} from '@tagspaces/tagspaces-common/paths';-import { useReducer, useRef, useState } from 'react';+import React, { useReducer, useRef, useState } from 'react';import { useTranslation } from 'react-i18next';import TagsSelect from '../TagsSelect';+import AiGenTagsButton from '-/components/chat/AiGenTagsButton';+import { Pro } from '-/pro';interface Props {open: boolean;@@ -202,6 +204,12 @@ function AddRemoveTagsDialog(props: Props) {>{t('core:cancel')}</TsButton>+ <AiGenTagsButton+ disabled={!Pro}+ entries={selected}+ variant="outlined"+ generationCompleted={() => onCloseDialog()}+ /><TsButtondata-tid="cleanTagsMultipleEntries"disabled={selected.length < 1}diff --git a/src/renderer/components/dialogs/SettingsDialog.tsx b/src/renderer/components/dialogs/SettingsDialog.tsxindex 255979d4b..8bfbdd2ea 100644--- a/src/renderer/components/dialogs/SettingsDialog.tsx+++ b/src/renderer/components/dialogs/SettingsDialog.tsx@@ -157,23 +157,21 @@ function SettingsDialog(props: Props) {data-tid="advancedSettingsDialogTID"label={t('core:advancedSettingsTab')}/>- {AppConfig.isElectron && (- <Tab- style={{- textTransform: 'unset',- justifyContent: 'flex-start',- }}- data-tid="aiSettingsDialogTID"- iconPosition="start"- icon={!smallScreen && <AIIcon />}- label={- <span style={{ whiteSpace: 'nowrap' }}>- {t('core:aiSettingsTab')}- <BetaLabel />- </span>- }- />- )}+ <Tab+ style={{+ textTransform: 'unset',+ justifyContent: 'flex-start',+ }}+ data-tid="aiSettingsDialogTID"+ iconPosition="start"+ icon={!smallScreen && <AIIcon />}+ label={+ <span style={{ whiteSpace: 'nowrap' }}>+ {t('core:aiSettingsTab')}+ <BetaLabel />+ </span>+ }+ /></Tabs><divdata-tid="settingsDialog"diff --git a/src/renderer/components/dialogs/components/SettingsAI.tsx b/src/renderer/components/dialogs/components/SettingsAI.tsxindex e549884a4..104cce6b4 100644--- a/src/renderer/components/dialogs/components/SettingsAI.tsx+++ b/src/renderer/components/dialogs/components/SettingsAI.tsx@@ -72,7 +72,7 @@ interface Props {function SettingsAI(props: Props) {const { i18n, t } = useTranslation();const { closeSettings } = props;- const { changeCurrentModel } = useChatContext();+ const { changeCurrentModel, checkProviderAlive } = useChatContext();const aiDefaultProvider: AIProvider = useSelector(getDefaultAIProvider);const aiProviders: AIProvider[] = useSelector(getAIProviders);//const ollamaAlive = useRef<boolean | null>(null);@@ -103,20 +103,14 @@ function SettingsAI(props: Props) {function checkOllamaAlive() {aiProviders.map((provider) =>- window.electronIO.ipcRenderer- .invoke('getOllamaModels', provider.url)- .then((m) => {- const alive = !!m;- providersAlive.current = {- ...providersAlive.current,- [provider.id]: alive,- };- forceUpdate();- return alive;- /*if (provider.alive !== alive) {- handleChangeProvider(provider.id, 'alive', alive);- }*/- }),+ checkProviderAlive(provider.url).then((alive) => {+ providersAlive.current = {+ ...providersAlive.current,+ [provider.id]: alive,+ };+ forceUpdate();+ return alive;+ }),);//Promise.all(promises).then(() => forceUpdate());}@@ -143,23 +137,21 @@ function SettingsAI(props: Props) {//event: ChangeEvent<HTMLInputElement>) => {//const provider: AIProviders = event.target.value as AIProviders;const providerUrl = provider === 'ollama' ? 'http://localhost:11434' : '';- window.electronIO.ipcRenderer- .invoke('getOllamaModels', providerUrl)- .then((m) => {- const providerId = getUuid();- providersAlive.current = {- ...providersAlive.current,- [providerId]: !!m,- };- const aiProvider: AIProvider = {- id: providerId,- engine: provider,- name: provider,- url: providerUrl,- enable: true,- };- dispatch(SettingsActions.addAiProvider(aiProvider));- });+ checkProviderAlive(providerUrl).then((isAlive) => {+ const providerId = getUuid();+ providersAlive.current = {+ ...providersAlive.current,+ [providerId]: isAlive,+ };+ const aiProvider: AIProvider = {+ id: providerId,+ engine: provider,+ name: provider,+ url: providerUrl,+ enable: true,+ };+ dispatch(SettingsActions.addAiProvider(aiProvider));+ });};const externalConfig = typeof window.ExtAI !== 'undefined';@@ -413,6 +405,7 @@ function SettingsAI(props: Props) {);changeCurrentModel(modelName, closeSettings);}}+ aiProvider={provider}chosenModel={provider.defaultTextModel}/><SelectChatModel@@ -425,6 +418,7 @@ function SettingsAI(props: Props) {);changeCurrentModel(modelName, closeSettings);}}+ aiProvider={provider}chosenModel={provider.defaultImageModel}/><FormControlLabeldiff --git a/src/renderer/hooks/ChatProvider.tsx b/src/renderer/hooks/ChatProvider.tsxindex 6fb0d7a5b..dee4a6e38 100644--- a/src/renderer/hooks/ChatProvider.tsx+++ b/src/renderer/hooks/ChatProvider.tsx@@ -24,7 +24,6 @@ import {ChatMode,ChatRole,HistoryModel,- Model,PullModelResponse,} from '-/components/chat/ChatTypes';import { useFileUploadDialogContext } from '-/components/dialogs/hooks/useFileUploadDialogContext';@@ -58,34 +57,49 @@ import React, {useMemo,useReducer,useRef,+ useState,} from 'react';import { useTranslation } from 'react-i18next';import { useDispatch, useSelector } from 'react-redux';import { useIOActionsContext } from '-/hooks/useIOActionsContext';import { TabNames } from '-/hooks/EntryPropsTabsContextProvider';+import {+ deleteOllamaModel,+ getOllamaModels,+ newOllamaMessage,+ pullOllamaModel,+} from '-/components/chat/OllamaClient';+import { Ollama, ChatRequest, ModelResponse } from 'ollama';+import { zodToJsonSchema } from 'zod-to-json-schema';+import { z } from 'zod';++/*export type TimelineItem = {+ request: string;+ response?: string;+};*/type ChatData = {- models: Model[];+ //timelineItems: TimelineItem[];+ models: ModelResponse[];images: ChatImage[];- currentModel: Model;- openedEntryModel: Model;+ currentModel: ModelResponse;+ //openedEntryModel: ModelResponse;chatHistoryItems: ChatItem[];- //isTyping: boolean;+ isTyping: boolean;refreshOllamaModels: (modelName?: string) => void;- setModel: (model: Model | string) => Promise<boolean>;+ setModel: (model: ModelResponse | string) => Promise<boolean>;setImages: (imagesPaths: string[]) => void;removeImage: (uuid: string) => void;unloadCurrentModel: () => void;removeModel: (modelName: string) => void;- findModel: (modelName: string) => Model;+ findModel: (modelName: string) => ModelResponse;getHistoryFilePath: (name?: string) => string;changeCurrentModel: (newModelName: string,confirmCallback?: () => void,) => Promise<boolean>;- getModel: (modelName: string) => Promise<Model>;- addTimeLineRequest: (txt: string, role: ChatRole) => void;- addTimeLineResponse: (txt: string, replace?: boolean) => ChatItem[];+ getModel: (modelName: string) => Promise<ModelResponse>;+ addChatHistory: (txt: string, replace?: boolean) => ChatItem[];newChatMessage: (msg?: string,unload?: boolean,@@ -96,18 +110,28 @@ type ChatData = {images?: string[],includeHistory?: boolean,) => Promise<any>;- generate: (fileContent: 'text' | 'image', mode: ChatMode) => Promise<string>;+ cancelMessage: () => void;+ generate: (+ fileContent: 'text' | 'image',+ mode: ChatMode,+ modelName: string,+ entry: TS.FileSystemEntry,+ ) => Promise<string>;initHistory: () => void;deleteHistory: () => Promise<boolean>;+ checkProviderAlive: (providerUrl: string) => Promise<boolean>;+ getOllamaClient: (ollamaApiUrl: string) => Promise<Ollama>;+ getEntryModel: (entryName: string, aiProvider: AIProvider) => ModelResponse;};export const ChatContext = createContext<ChatData>({+ //timelineItems: [],models: [],images: [],currentModel: undefined,- openedEntryModel: undefined,+ //openedEntryModel: undefined,chatHistoryItems: [],- //isTyping: false,+ isTyping: false,refreshOllamaModels: undefined,setModel: undefined,setImages: undefined,@@ -118,12 +142,15 @@ export const ChatContext = createContext<ChatData>({getHistoryFilePath: undefined,changeCurrentModel: undefined,getModel: undefined,- addTimeLineRequest: undefined,- addTimeLineResponse: undefined,+ addChatHistory: undefined,newChatMessage: undefined,+ cancelMessage: undefined,generate: undefined,initHistory: undefined,deleteHistory: undefined,+ checkProviderAlive: undefined,+ getOllamaClient: undefined,+ getEntryModel: undefined,});export type ChatContextProviderProps = {@@ -139,13 +166,13 @@ export const ChatContextProvider = ({ children }: ChatContextProviderProps) => {const { currentLocation } = useCurrentLocationContext();const { saveFilePromise, deleteEntriesPromise } = usePlatformFacadeContext();const { openedEntry } = useOpenedEntryContext();- const models = useRef<Model[]>([]);+ const models = useRef<ModelResponse[]>([]);const defaultAiProvider: AIProvider = useSelector(getDefaultAIProvider);const selectedTabName = useSelector(getEntryContainerTab);- const currentModel = useRef<Model>(undefined);- const openedEntryModel = useRef<Model>(+ const currentModel = useRef<ModelResponse>(undefined);+ /*const openedEntryModel = useRef<ModelResponse>(getOpenedEntryModel(openedEntry?.name, defaultAiProvider),- );+ );*/const images = useRef<ChatImage[]>([]);//const defaultAiProviderId: string = useSelector(getDefaultAIProviderId);//const aiProviders: AIProvider[] = useSelector(getAIProviders);getDefaultAIProvider(defaultAiProviderId,aiProviders);@@ -160,12 +187,14 @@ export const ChatContextProvider = ({ children }: ChatContextProviderProps) => {const GENERATE_TAGS = Pro && Pro.UI ? Pro.UI.GENERATE_TAGS : false;const GENERATE_IMAGE_TAGS =Pro && Pro.UI ? Pro.UI.GENERATE_IMAGE_TAGS : false;- // const isTyping = useRef<boolean>(false);+ const isTyping = useRef<boolean>(false);+ //const timelineItems = useRef<TimelineItem[]>([]);+ const ollamaClient = useRef<Ollama>(undefined);const dispatch: AppDispatch = useDispatch();const [ignored, forceUpdate] = useReducer((x) => x + 1, 0, undefined);+ /*useEffect(() => {- if (AppConfig.isElectron) {//refreshOllamaModels();window.electronIO.ipcRenderer.on('PullModel',@@ -191,21 +220,39 @@ export const ChatContextProvider = ({ children }: ChatContextProviderProps) => {window.electronIO.ipcRenderer.removeAllListeners('ChatMessage');unloadCurrentModel();};- }- }, []);+ }, []);*/useEffect(() => {- refreshOllamaModels();- setOpenedEntryModel();+ if (defaultAiProvider) {+ getOllamaClient(defaultAiProvider.url).then((client) => {+ ollamaClient.current = client;+ refreshOllamaModels();+ //setOpenedEntryModel();+ });+ }}, [defaultAiProvider]);useEffect(() => {- setOpenedEntryModel();+ //setOpenedEntryModel();if (selectedTabName === TabNames.aiTab) {initHistory();}}, [openedEntry]);+ async function getOllamaClient(ollamaApiUrl: string) {+ if (ollamaApiUrl) {+ try {+ //@ts-ignore+ const { Ollama } = await import('ollama/browser');++ return new Ollama({ host: ollamaApiUrl });+ } catch (error) {+ console.error('Failed to load Ollama module:', error);+ }+ }+ return undefined;+ }+function initHistory() {if (openedEntry) {if (@@ -221,7 +268,7 @@ export const ChatContextProvider = ({ children }: ChatContextProviderProps) => {}}- function setOpenedEntryModel() {+ /* function setOpenedEntryModel() {if (openedEntry) {const newModel = getOpenedEntryModel(openedEntry.name, defaultAiProvider);if (@@ -233,12 +280,12 @@ export const ChatContextProvider = ({ children }: ChatContextProviderProps) => {forceUpdate();}}- }+ }*/- function getOpenedEntryModel(+ function getEntryModel(fileName: string,aiProvider: AIProvider,- ): Model {+ ): ModelResponse {if (fileName && aiProvider) {const ext = extractFileExtension(fileName).toLowerCase();let model;@@ -293,10 +340,17 @@ export const ChatContextProvider = ({ children }: ChatContextProviderProps) => {return Promise.resolve([]);}+ function checkProviderAlive(providerUrl: string): Promise<boolean> {+ return getOllamaClient(providerUrl).then((client) =>+ getOllamaModels(client).then((m) => {+ return !!m;+ }),+ );+ }+function refreshOllamaModels(modelName = undefined) {- if (AppConfig.isElectron && defaultAiProvider) {- window.electronIO.ipcRenderer- .invoke('getOllamaModels', defaultAiProvider.url)+ if (defaultAiProvider) {+ getOllamaModels(ollamaClient.current).then((m) => {if (m) {models.current = m;@@ -304,17 +358,25 @@ export const ChatContextProvider = ({ children }: ChatContextProviderProps) => {if (model) {return setModel(model);} else {- //if (currentModel.current === undefined) {//set defaultTextModel if not found- return setModel(defaultAiProvider.defaultTextModel);+ const model = findModel(defaultAiProvider.defaultTextModel);+ if (model) {+ return setModel(defaultAiProvider.defaultTextModel);+ }}+ return true;+ }+ return false;+ })+ .then((success) => {+ if (success) {forceUpdate();}});}}- function setModel(m: Model | string): Promise<boolean> {+ function setModel(m: ModelResponse | string): Promise<boolean> {const model = typeof m === 'string' ? findModel(m) : m;if (model &&@@ -398,7 +460,16 @@ export const ChatContextProvider = ({ children }: ChatContextProviderProps) => {if (result) {//addTimeLineRequest('deleting ' + model.name, 'system');showNotification('deleting ' + model.name + ' succeeded');- window.electronIO.ipcRenderer+ deleteOllamaModel(ollamaClient.current, model.name).then((response) => {+ console.log('deleteOllamaModel response:' + response);+ if (response) {+ if (model.name === currentModel.current?.name) {+ currentModel.current = undefined;+ }+ refreshOllamaModels();+ }+ });+ /*window.electronIO.ipcRenderer.invoke('deleteOllamaModel', defaultAiProvider.url, {name: model.name,})@@ -410,7 +481,7 @@ export const ChatContextProvider = ({ children }: ChatContextProviderProps) => {}refreshOllamaModels();}- });+ });*/}}}@@ -425,20 +496,18 @@ export const ChatContextProvider = ({ children }: ChatContextProviderProps) => {* check if model is installed and return details* @param modelName*/- function getModel(modelName: string): Promise<Model> {- if (!AppConfig.isElectron || !modelName || !defaultAiProvider) {+ function getModel(modelName: string): Promise<ModelResponse> {+ if (!modelName || !defaultAiProvider) {return Promise.resolve(undefined);}- return window.electronIO.ipcRenderer- .invoke('getOllamaModels', defaultAiProvider.url)- .then((m) => {- if (m && m.length > 0) {- return m.find(- (mm) => mm.name === modelName || mm.name === modelName + ':latest',- );- }- return undefined;- });+ return getOllamaModels(ollamaClient.current).then((m) => {+ if (m && m.length > 0) {+ return m.find(+ (mm) => mm.name === modelName || mm.name === modelName + ':latest',+ );+ }+ return undefined;+ });}function changeCurrentModel(@@ -458,7 +527,31 @@ export const ChatContextProvider = ({ children }: ChatContextProviderProps) => {}// addTimeLineRequest('downloading ' + newModelName, 'system');openFileUploadDialog(newModelName, 'downloadChatModel');- return window.electronIO.ipcRenderer+ const onProgressHandler = (message: PullModelResponse) => {+ if (message.status) {+ dispatch(+ AppActions.onUploadProgress(+ {+ key: message.model || message.status,+ loaded: message.completed,+ total: message.total,+ },+ undefined,+ message.model,+ ),+ );+ }+ };+ pullOllamaModel(+ ollamaClient.current,+ newModelName,+ onProgressHandler,+ ).then((response) => {+ console.log('pullOllamaModel response:' + response);+ refreshOllamaModels(newModelName);+ return true;+ });+ /*return window.electronIO.ipcRenderer.invoke('pullOllamaModel', defaultAiProvider.url, {name: newModelName,stream: true,@@ -467,13 +560,13 @@ export const ChatContextProvider = ({ children }: ChatContextProviderProps) => {console.log('pullOllamaModel response:' + response);refreshOllamaModels(newModelName);return true;- });+ });*/}}return Promise.resolve(true);}- function addTimeLineRequest(txt: string, role: ChatRole) {+ function addHistoryItem(txt: string, role: ChatRole) {if (txt) {const newItem: ChatItem = {engine: 'ollama',@@ -546,13 +639,27 @@ export const ChatContextProvider = ({ children }: ChatContextProviderProps) => {}}- function addTimeLineResponse(txt, replace = false): ChatItem[] {+ /* function addTimeLineRequest(txt) {+ const newItem: ChatItem = {engine: undefined, modelName: "", role: undefined, timestamp: 0, request: txt };+ chatHistoryItems.current = [newItem, ...timelineItems.current];+ forceUpdate();+ }*/++ function addTimeLineResponse(txt) {+ if (chatHistoryItems.current.length > 0) {+ const firstItem = chatHistoryItems.current.shift();+ firstItem.response = (firstItem.response ? firstItem.response : '') + txt;+ chatHistoryItems.current = [firstItem, ...chatHistoryItems.current];+ forceUpdate();+ }+ }++ function addChatHistory(txt, replace = false): ChatItem[] {if (txt && chatHistoryItems.current.length > 0) {chatHistoryItems.current[0].response =(!replace && chatHistoryItems.current[0].response? chatHistoryItems.current[0].response: '') + txt;- //isTyping.current = true;// forceUpdate(); don't refresh chatHistoryItems this will reload milkdown editor just update(content)}return chatHistoryItems.current;@@ -634,6 +741,55 @@ export const ChatContextProvider = ({ children }: ChatContextProviderProps) => {return msg;}+ const chatMessageHandler = useMemo(() => {+ return (msg): void => {+ //console.log(`Chat ${msg}`);+ isTyping.current = true;+ addTimeLineResponse(msg);+ };+ }, []);++ const Tags = z.object({+ topics: z.array(z.string()).max(4), // todo define generated tags maxLength in settings+ });+ const Description = z.object({+ name: z.string(),+ summary: z.string(),+ });+ const ObjectSchema = z.object({+ name: z.string().describe('The name of the object'),+ confidence: z+ .number()+ .min(0)+ .max(1)+ .describe('The confidence score of the object detection'),+ attributes: z+ .record(z.any())+ .optional()+ .describe('Additional attributes of the object'),+ //attributes: z.string(),+ });+ const ImageDescription = z.object({+ name: z.string().describe('The name of the Image'),+ summary: z.string().describe('A concise summary of the image'),+ objects: z+ .array(ObjectSchema)+ .describe('An array of objects detected in the image'),+ scene: z.string().describe('The scene of the image'),+ colors: z+ .array(z.string())+ .describe('An array of colors detected in the image'),+ time_of_day: z+ .enum(['Morning', 'Afternoon', 'Evening', 'Night', 'Unknown'])+ .describe('The time of day the image was taken'),+ setting: z+ .enum(['Indoor', 'Outdoor', 'Unknown'])+ .describe('The setting of the image'),+ text_content: z+ .string()+ .optional()+ .describe('Any text detected in the image'),+ });/*** @param msg If the messages array is empty, the model will be loaded into memory.* @param unload If the messages array is empty and the keep_alive parameter is set to 0, a model will be unloaded from memory.@@ -650,7 +806,7 @@ export const ChatContextProvider = ({ children }: ChatContextProviderProps) => {role: ChatRole = 'user',mode: ChatMode = undefined,model: string = currentModel.current?.name,- stream: boolean = true,+ stream: boolean = false,imgArray: string[] = [],includeHistory = true,): Promise<any> {@@ -678,28 +834,121 @@ export const ChatContextProvider = ({ children }: ChatContextProviderProps) => {]: [];if (includeHistory) {- addTimeLineRequest(msg, role);+ addHistoryItem(msg, role);+ }+ let format = undefined;+ if (mode === 'tags') {+ if (imgArray.length > 0) {+ format = { format: zodToJsonSchema(ImageDescription) };+ } else {+ format = { format: zodToJsonSchema(Tags) };+ }+ } else if (mode === 'description' || mode === 'summary') {+ if (imgArray.length > 0) {+ format = { format: zodToJsonSchema(ImageDescription) };+ } else {+ format = { format: zodToJsonSchema(Description) };+ }}- return window.electronIO.ipcRenderer+ const request: ChatRequest = {+ model,+ messages,+ stream: stream,+ ...(unload && { keep_alive: 0 }),+ ...(format && format),+ };+ return newOllamaMessage(+ ollamaClient.current,+ request,+ chatMessageHandler,+ ).then((apiResponse) => {+ isTyping.current = false;+ if (msg && includeHistory) {+ saveHistoryItems();+ }+ if (mode === 'tags') {+ if (imgArray.length > 0) {+ const response = ImageDescription.parse(JSON.parse(apiResponse));+ const tags = response.objects.map((obj) => obj.name);+ if (response.time_of_day && response.time_of_day !== 'Unknown') {+ tags.push(response.time_of_day);+ }+ if (response.setting && response.setting !== 'Unknown') {+ tags.push(response.setting);+ }+ return [...tags, ...response.colors];+ } else {+ const response = Tags.parse(JSON.parse(apiResponse));+ return response.topics;+ }+ } else if (mode === 'description' || mode === 'summary') {+ if (imgArray.length > 0) {+ const response = ImageDescription.parse(JSON.parse(apiResponse));+ const objArray = response.objects.map(+ (obj) =>+ '\n\n > ##### Name: \n\n' ++ obj.name ++ '\n\n > ##### Attributes: \n\n' ++ obj.attributes,+ );+ return (+ '### Name: \n\n' ++ response.name ++ '\n\n ### Objects: \n\n' ++ objArray.join('\n\n') ++ '\n\n ### Scene: \n\n' ++ response.scene ++ '\n\n ### Colors:\n\n' ++ response.colors ++ '\n\n ### Summary:\n\n' ++ response.summary ++ '\n\n ### Day Time:\n\n' ++ response.time_of_day ++ '\n\n ### Setting:\n\n' ++ response.setting ++ (response.text_content+ ? '\n\n ### Content:\n\n' + response.text_content+ : '')+ );+ } else {+ const response = Description.parse(JSON.parse(apiResponse));+ return (+ '### Name: \n\n' ++ response.name ++ '\n\n ### Summary:\n\n' ++ response.summary+ );+ }+ }+ return stream ? true : apiResponse;+ });+ /*return window.electronIO.ipcRenderer.invoke('newOllamaMessage', defaultAiProvider.url, {model,messages,stream: stream,...(unload && { keep_alive: 0 }),})- .then((apiResponse) => {- if (msg && includeHistory) {- saveHistoryItems();- }- return stream ? true : apiResponse;- });+ */}- function getFileContent(content: any): Promise<string> {- if (openedEntry.path.endsWith('.pdf')) {+ function cancelMessage() {+ if (ollamaClient.current) {+ ollamaClient.current.abort();+ isTyping.current = false;+ saveHistoryItems();+ forceUpdate();+ }+ }++ function getFileContent(+ entry: TS.FileSystemEntry,+ content: any,+ ): Promise<string> {+ if (entry.path.endsWith('.pdf')) {return extractPDFcontent(content);- } else if (openedEntry.path.endsWith('.html')) {- return extractTextContent(openedEntry.name, content);+ } else if (entry.path.endsWith('.html')) {+ return extractTextContent(entry.name, content);}return Promise.resolve(content);}@@ -717,23 +966,25 @@ export const ChatContextProvider = ({ children }: ChatContextProviderProps) => {function generate(fileContent: 'text' | 'image',mode: ChatMode,+ modelName: string,+ entry: TS.FileSystemEntry,): Promise<string> {- if (openedEntryModel.current) {+ if (modelName) {return currentLocation.getFileContentPromise(- openedEntry.path,- fileContent === 'text' && !openedEntry.path.endsWith('.pdf')+ entry.path,+ fileContent === 'text' && !entry.path.endsWith('.pdf')? 'text': 'arraybuffer',)- .then((content) => getFileContent(content))+ .then((content) => getFileContent(entry, content)).then((content) =>newChatMessage(fileContent === 'image' ? undefined : content,false,'user',mode,- openedEntryModel.current.name,+ modelName, //openedEntryModel.current.name,false,getImageArray(fileContent, content),false,@@ -751,10 +1002,11 @@ export const ChatContextProvider = ({ children }: ChatContextProviderProps) => {const context = useMemo(() => {return {+ isTyping: isTyping.current,models: models.current,images: images.current,currentModel: currentModel.current,- openedEntryModel: openedEntryModel.current,+ //openedEntryModel: openedEntryModel.current,chatHistoryItems: chatHistoryItems.current,refreshOllamaModels,getHistoryFilePath,@@ -765,20 +1017,25 @@ export const ChatContextProvider = ({ children }: ChatContextProviderProps) => {removeModel,changeCurrentModel,getModel,- addTimeLineRequest,addTimeLineResponse,+ addChatHistory,newChatMessage,+ cancelMessage,findModel,generate,initHistory,deleteHistory,+ checkProviderAlive,+ getOllamaClient,+ getEntryModel,};}, [defaultAiProvider,+ isTyping.current,models.current,images.current,currentModel.current,- openedEntryModel.current,+ //openedEntryModel.current,chatHistoryItems.current,openedEntry,selectedEntries,diff --git a/src/renderer/hooks/EntryPropsTabsContextProvider.tsx b/src/renderer/hooks/EntryPropsTabsContextProvider.tsxindex 5946386e0..5972f8811 100644--- a/src/renderer/hooks/EntryPropsTabsContextProvider.tsx+++ b/src/renderer/hooks/EntryPropsTabsContextProvider.tsx@@ -146,19 +146,13 @@ export const EntryPropsTabsContextProvider = ({tabsArray.push(tab3);}- if (- (oEntry && !oEntry.isFile) ||- (devMode && Pro && AppConfig.isElectron)- ) {- if (AppConfig.isElectron) {- // todo enable for web- const tab4: TabItem = {- icon: <AIIcon />,- title: t('core:aiChatTab'),- name: TabNames.aiTab,- };- tabsArray.push(tab4);- }+ if ((oEntry && !oEntry.isFile) || (devMode && Pro)) {+ const tab4: TabItem = {+ icon: <AIIcon />,+ title: t('core:aiChatTab'),+ name: TabNames.aiTab,+ };+ tabsArray.push(tab4);}const tab5: TabItem = {icon: <LinkIcon />,diff --git a/tests/e2e/general.helpers.js b/tests/e2e/general.helpers.jsindex d19e9a64b..127e4e584 100644--- a/tests/e2e/general.helpers.js+++ b/tests/e2e/general.helpers.js@@ -415,7 +415,7 @@ export async function expectAllFileSelected(isSelected = true) {export async function expectElementSelected(selector,isSelected = true,- timeout = 2000,+ timeout = 4000,) {// [data-testid="' + (isSelected ? 'CheckCircleIcon' : 'RadioButtonUncheckedIcon') + '"]const sel = '[data-tid="fsEntryName_' + dataTidFormat(selector) + '"]';diff --git a/tsconfig.json b/tsconfig.jsonindex b40fc55ed..fe8a99432 100644--- a/tsconfig.json+++ b/tsconfig.json@@ -3,7 +3,7 @@"incremental": true,"target": "es2022","ignoreDeprecations": "5.0",- "module": "commonjs",+ "module": "CommonJS","lib": ["dom", "dom.iterable", "es2022"],"jsx": "react-jsx",//"strict": true,