Skip to content

TagSpaces is an offline, open source, document manager with tagging support

Fix generating tags from folder description (#2267)

Stanimirafc0bcae01e1
diff --git a/src/renderer/components/EditDescriptionButtons.tsx b/src/renderer/components/EditDescriptionButtons.tsx
index a91378132..4f291a231 100644
--- a/src/renderer/components/EditDescriptionButtons.tsx
+++ b/src/renderer/components/EditDescriptionButtons.tsx
@@ -128,7 +128,8 @@ const EditDescriptionButtons: React.FC<ButtonsProps> = ({ getHtml }) => {
whiteSpace: 'nowrap',
overflowX: 'auto',
overflowY: 'hidden',
- maxHeight: 46,
+ alignItems: 'center',
+ display: 'flex',
}}
>
<ButtonGroup>
@@ -202,7 +203,7 @@ const EditDescriptionButtons: React.FC<ButtonsProps> = ({ getHtml }) => {
<TsIconButton
tooltip={t('core:chatMore')}
onClick={handleMoreClick}
- //style={{ float: 'right', marginTop: -5 }}
+ style={{ marginLeft: AppConfig.defaultSpaceBetweenButtons }}
data-tid="chatMoreTID"
aria-label={t('core:chatMore')}
aria-controls={Boolean(anchorEl) ? 'account-menu' : undefined}
diff --git a/src/renderer/components/chat/AiGenDescButton.tsx b/src/renderer/components/chat/AiGenDescButton.tsx
index def0e89b4..9a00d836f 100644
--- a/src/renderer/components/chat/AiGenDescButton.tsx
+++ b/src/renderer/components/chat/AiGenDescButton.tsx
@@ -50,7 +50,7 @@ function AiGenDescButton(props: Props) {
const [isLoading, setIsLoading] = useState<boolean>(false);
//const openedEntryModel = getEntryModel(openedEntry?.name, defaultAiProvider);
- if (!openedEntry) {
+ if (!openedEntry || !openedEntry.isFile) {
//|| !openedEntryModel) {
return null;
}
diff --git a/src/renderer/components/chat/AiGenTagsButton.tsx b/src/renderer/components/chat/AiGenTagsButton.tsx
index 9195e73a8..0c0fa60d3 100644
--- a/src/renderer/components/chat/AiGenTagsButton.tsx
+++ b/src/renderer/components/chat/AiGenTagsButton.tsx
@@ -61,11 +61,13 @@ function AiGenTagsButton(props: Props) {
generateEntries = [openedEntry];
}
- const extensionSupported = generateEntries.every((entry) =>
- [
- ...AppConfig.aiSupportedFiletypes.text,
- ...AppConfig.aiSupportedFiletypes.image,
- ].includes(entry.extension),
+ const extensionSupported = generateEntries.every(
+ (entry) =>
+ !entry.isFile ||
+ [
+ ...AppConfig.aiSupportedFiletypes.text,
+ ...AppConfig.aiSupportedFiletypes.image,
+ ].includes(entry.extension),
);
if (!generateEntries || !defaultAiProvider || !extensionSupported) {
diff --git a/src/renderer/hooks/ChatProvider.tsx b/src/renderer/hooks/ChatProvider.tsx
index 39211d59a..6eec846eb 100644
--- a/src/renderer/hooks/ChatProvider.tsx
+++ b/src/renderer/hooks/ChatProvider.tsx
@@ -363,7 +363,7 @@ export const ChatContextProvider = ({ children }: ChatContextProviderProps) => {
): ModelResponse {
if (fileName && aiProvider) {
const ext = extractFileExtension(fileName).toLowerCase();
- let model;
+ let model = aiProvider.defaultTextModel; // folders don't have Extension
if (AppConfig.aiSupportedFiletypes.text.includes(ext)) {
model = aiProvider.defaultTextModel;
} else if (AppConfig.aiSupportedFiletypes.image.includes(ext)) {
@@ -1158,30 +1158,44 @@ export const ChatContextProvider = ({ children }: ChatContextProviderProps) => {
entry: TS.FileSystemEntry,
): Promise<string> {
if (modelName) {
- return currentLocation
- .getFileContentPromise(
- entry.path,
- fileContent === 'text' && !entry.path.endsWith('.pdf')
- ? 'text'
- : 'arraybuffer',
- )
- .then((content) => getFileContent(entry, content))
- .then((content) =>
- newChatMessage(
- fileContent === 'image' ? undefined : content,
- false,
- 'user',
- mode,
- modelName, //openedEntryModel.current.name,
- false,
- getImageArray(fileContent, content),
- false,
- ),
- )
- .catch((e) => {
- console.log('newOllamaMessage error:', e);
- return undefined;
- });
+ if (entry.isFile) {
+ return currentLocation
+ .getFileContentPromise(
+ entry.path,
+ fileContent === 'text' && !entry.path.endsWith('.pdf')
+ ? 'text'
+ : 'arraybuffer',
+ )
+ .then((content) => getFileContent(entry, content))
+ .then((content) =>
+ newChatMessage(
+ fileContent === 'image' ? undefined : content,
+ false,
+ 'user',
+ mode,
+ modelName, //openedEntryModel.current.name,
+ false,
+ getImageArray(fileContent, content),
+ false,
+ ),
+ )
+ .catch((e) => {
+ console.log('newOllamaMessage error:', e);
+ return undefined;
+ });
+ } else {
+ // folder
+ return newChatMessage(
+ entry.name,
+ false,
+ 'user',
+ mode,
+ modelName, //openedEntryModel.current.name,
+ false,
+ [],
+ false,
+ );
+ }
} else {
showNotification('Model not found, try pulling it first');
}
@@ -1212,7 +1226,10 @@ export const ChatContextProvider = ({ children }: ChatContextProviderProps) => {
generationSettings.current.appendAnalysisToDescription,
),
);
- } else if (AppConfig.aiSupportedFiletypes.text.includes(ext)) {
+ } else if (
+ AppConfig.aiSupportedFiletypes.text.includes(ext) ||
+ ext === '' /*folders*/
+ ) {
return generate('text', 'description', entryModel.name, entry).then(
(results) =>
handleGenDescResults(