diff --git a/packages/kbot/cat.png b/packages/kbot/cat.png deleted file mode 100644 index 87113636..00000000 Binary files a/packages/kbot/cat.png and /dev/null differ diff --git a/packages/kbot/dist-in/commands/images.js b/packages/kbot/dist-in/commands/images.js index edc6d0dd..b16467c2 100644 --- a/packages/kbot/dist-in/commands/images.js +++ b/packages/kbot/dist-in/commands/images.js @@ -2,7 +2,7 @@ import { z } from 'zod'; import * as path from 'node:path'; import { sync as write } from '@polymech/fs/write'; import { sync as exists } from '@polymech/fs/exists'; -import { readFileSync } from 'node:fs'; +import { readFileSync, statSync, unlinkSync } from 'node:fs'; import { variables } from '../variables.js'; import { resolve } from '@polymech/commons'; import { isArray, isString } from '@polymech/core/primitives'; @@ -135,7 +135,7 @@ async function launchGuiAndGetPrompt(argv) { cmd: 'forward_image_to_frontend', base64, mimeType, - filename + filename: imagePath }; tauriProcess.stdin?.write(JSON.stringify(imageResponse) + '\n'); logger.info(`📤 Sent image data: ${filename} (${Math.round(base64.length / 1024)}KB)`); @@ -146,13 +146,75 @@ async function launchGuiAndGetPrompt(argv) { } } } + else if (message.type === 'delete_request') { + logger.info('📨 Received delete request from GUI'); + const pathToDelete = message.path; + if (pathToDelete && isString(pathToDelete)) { + try { + if (exists(pathToDelete)) { + unlinkSync(pathToDelete); + logger.info(`✅ File deleted successfully: ${pathToDelete}`); + const successResponse = { + cmd: 'file_deleted_successfully', + path: pathToDelete + }; + tauriProcess.stdin?.write(JSON.stringify(successResponse) + '\n'); + } + else { + logger.warn(`⚠️ File not found for deletion: ${pathToDelete}`); + const errorResponse = { + cmd: 'file_deletion_error', + path: pathToDelete, + error: 'File not found on server.' + }; + tauriProcess.stdin?.write(JSON.stringify(errorResponse) + '\n'); + } + } + catch (error) { + logger.error(`❌ Failed to delete file: ${pathToDelete}`, error.message); + const errorResponse = { + cmd: 'file_deletion_error', + path: pathToDelete, + error: error.message + }; + tauriProcess.stdin?.write(JSON.stringify(errorResponse) + '\n'); + } + } + else { + logger.error('Invalid delete request from GUI, path is missing.'); + } + } else if (message.type === 'generate_request') { logger.info('📨 Received generation request from GUI'); // Process the generation request using our existing image generation logic try { const genPrompt = message.prompt; const genFiles = message.files || []; - const genDst = message.dst; + // --- New logic for destination path --- + let dstDir; + if (argv.dst) { + const absoluteDst = path.resolve(argv.dst); + const dstStat = exists(absoluteDst) ? statSync(absoluteDst) : null; + if (dstStat && dstStat.isDirectory()) { + dstDir = absoluteDst; + } + else { + dstDir = path.dirname(absoluteDst); + } + } + else if (genFiles.length > 0) { + dstDir = path.dirname(genFiles[0]); + } + else { + dstDir = process.cwd(); // fallback to current working dir + } + const baseFileName = genFiles.length > 0 + ? path.basename(genFiles[0], path.extname(genFiles[0])) + : 'generated'; + const newFileName = `${baseFileName}_gen_0.png`; + const finalDstPath = path.resolve(dstDir, newFileName); + logger.info(`📝 Determined destination path for generated image: ${finalDstPath}`); + // --- End new logic --- logger.info(`🎨 Starting image generation: "${genPrompt}"`); let imageBuffer = null; if (genFiles.length > 0) { @@ -162,7 +224,7 @@ async function launchGuiAndGetPrompt(argv) { ...argv, prompt: genPrompt, include: genFiles, - dst: genDst + dst: finalDstPath // Use the new path }); imageBuffer = await editImage(genPrompt, genFiles, parsedOptions); } @@ -172,21 +234,23 @@ async function launchGuiAndGetPrompt(argv) { const parsedOptions = ImageOptionsSchema().parse({ ...argv, prompt: genPrompt, - dst: genDst + dst: finalDstPath // Use the new path }); imageBuffer = await createImage(genPrompt, parsedOptions); } if (imageBuffer) { + write(finalDstPath, imageBuffer); + logger.info(`✅ Image saved to: ${finalDstPath}`); // Send the generated image back to the GUI (chat mode) const base64Result = imageBuffer.toString('base64'); const imageResponse = { cmd: 'forward_image_to_frontend', base64: base64Result, mimeType: 'image/png', - filename: path.basename(genDst) + filename: finalDstPath }; tauriProcess.stdin?.write(JSON.stringify(imageResponse) + '\n'); - logger.info(`✅ Generated image sent to GUI: ${genDst}`); + logger.info(`✅ Generated image sent to GUI: ${path.basename(finalDstPath)}`); } else { logger.error('❌ Failed to generate image'); @@ -315,4 +379,4 @@ export const imageCommand = async (argv) => { logger.error('Failed to parse options or generate image:', error.message, error.issues, error.stack); } }; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"images.js","sourceRoot":"","sources":["../../src/commands/images.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"images.js","sourceRoot":"","sources":["../../src/commands/images.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/packages/kbot/dist/win-64/tauri-app.exe b/packages/kbot/dist/win-64/tauri-app.exe index f4749854..c52a2ab4 100644 Binary files a/packages/kbot/dist/win-64/tauri-app.exe and b/packages/kbot/dist/win-64/tauri-app.exe differ diff --git a/packages/kbot/fat_cat.png b/packages/kbot/fat_cat.png deleted file mode 100644 index ab07da1b..00000000 Binary files a/packages/kbot/fat_cat.png and /dev/null differ diff --git a/packages/kbot/gui/tauri-app/src-tauri/src/lib.rs b/packages/kbot/gui/tauri-app/src-tauri/src/lib.rs index 7f0431f9..85e245fd 100644 --- a/packages/kbot/gui/tauri-app/src-tauri/src/lib.rs +++ b/packages/kbot/gui/tauri-app/src-tauri/src/lib.rs @@ -278,6 +278,22 @@ fn forward_image_to_frontend(base64: String, mime_type: String, filename: String Ok(()) } +#[tauri::command] +fn request_file_deletion(path: String) -> Result<(), String> { + eprintln!("[RUST LOG]: request_file_deletion command called."); + eprintln!("[RUST LOG]: - Path: {}", path); + + let request = serde_json::json!({ + "type": "delete_request", + "path": path, + }); + + println!("{}", serde_json::to_string(&request).unwrap()); + eprintln!("[RUST LOG]: Deletion request sent to images.ts"); + + Ok(()) +} + #[cfg_attr(mobile, tauri::mobile_entry_point)] pub fn run() { let app = tauri::Builder::default() @@ -302,7 +318,8 @@ pub fn run() { request_config_from_images, forward_config_to_frontend, forward_image_to_frontend, - generate_image_via_backend + generate_image_via_backend, + request_file_deletion ]) .setup(|app| { #[cfg(debug_assertions)] // only include this code on debug builds @@ -405,6 +422,25 @@ pub fn run() { eprintln!("[RUST LOG]: Generation complete emitted successfully"); } } + "file_deleted_successfully" => { + if let Some(path) = command.get("path").and_then(|v| v.as_str()) { + eprintln!("[RUST LOG]: Received confirmation of file deletion: {}", path); + if let Err(e) = app_handle.emit("file-deleted-successfully", &serde_json::json!({ "path": path })) { + eprintln!("[RUST LOG]: Failed to emit file-deleted-successfully: {}", e); + } + } + } + "file_deletion_error" => { + if let (Some(path), Some(error)) = ( + command.get("path").and_then(|v| v.as_str()), + command.get("error").and_then(|v| v.as_str()) + ) { + eprintln!("[RUST LOG]: Received file deletion error for {}: {}", path, error); + if let Err(e) = app_handle.emit("file-deletion-error", &serde_json::json!({ "path": path, "error": error })) { + eprintln!("[RUST LOG]: Failed to emit file-deletion-error: {}", e); + } + } + } _ => { eprintln!("[RUST LOG]: Unknown command: {}", cmd); } diff --git a/packages/kbot/gui/tauri-app/src/App.tsx b/packages/kbot/gui/tauri-app/src/App.tsx index 272fafea..bc7d5bdc 100644 --- a/packages/kbot/gui/tauri-app/src/App.tsx +++ b/packages/kbot/gui/tauri-app/src/App.tsx @@ -29,6 +29,12 @@ function App() { const [messageToSend, setMessageToSend] = useState(""); const [generationTimeoutId, setGenerationTimeoutId] = useState(null); + const deleteFilePermanently = async (pathToDelete: string) => { + addDebugMessage('info', `Requesting deletion of file: ${pathToDelete}`); + // This will be the new tauri command + await tauriApi.requestFileDeletion({ path: pathToDelete }); + }; + const generateDefaultDst = (fileCount: number, firstFilePath?: string) => { if (fileCount === 1 && firstFilePath) { const parsedPath = firstFilePath.split(/[/\\]/).pop() || 'image'; @@ -91,23 +97,17 @@ function App() { const addFiles = async (newPaths: string[]) => { const uniqueNewPaths = newPaths.filter(newPath => !files.some(f => f.path === newPath)); const newImageFiles: ImageFile[] = []; - + for (const path of uniqueNewPaths) { try { - const relativePath = await tauriApi.resolvePathRelativeToHome(path); - if (!relativePath) { - console.warn(`Could not resolve relative path for: ${path}`); - continue; - } - - const buffer = await tauriApi.fs.readFile(relativePath, { baseDir: tauriApi.fs.BaseDirectory().Home }); - + const buffer = await tauriApi.fs.readFile(path); + const base64 = arrayBufferToBase64(Array.from(buffer)); - const mimeType = path.toLowerCase().endsWith('.png') ? 'image/png' : - path.toLowerCase().endsWith('.jpg') || path.toLowerCase().endsWith('.jpeg') ? 'image/jpeg' : + const mimeType = path.toLowerCase().endsWith('.png') ? 'image/png' : + path.toLowerCase().endsWith('.jpg') || path.toLowerCase().endsWith('.jpeg') ? 'image/jpeg' : 'image/png'; const src = `data:${mimeType};base64,${base64}`; - + newImageFiles.push({ path, src }); } catch (e) { const errorMessage = e instanceof Error ? e.message : JSON.stringify(e); @@ -115,7 +115,7 @@ function App() { tauriApi.logErrorToConsole(`[Frontend Error] Failed to read file ${path}: ${errorMessage}`); } } - + setFiles(prevFiles => [...prevFiles, ...newImageFiles]); }; @@ -128,9 +128,9 @@ function App() { }; const toggleImageSelection = (imagePath: string) => { - setFiles(prev => - prev.map(file => - file.path === imagePath + setFiles(prev => + prev.map(file => + file.path === imagePath ? { ...file, selected: !file.selected } : file ) @@ -183,7 +183,7 @@ function App() { setIsGenerating(true); addDebugMessage('info', `🎨 Starting image generation via backend: "${promptText}"`); - + // Add placeholder image with spinner to the files grid const placeholderFile: ImageFile = { path: `generating_${Date.now()}`, @@ -198,43 +198,43 @@ function App() { `) }; - + setFiles(prev => [...prev, placeholderFile]); - + try { // Use the images.ts backend instead of direct API calls const filePaths = includeImages.map(img => img.path); const genDst = dst || `generated_${Date.now()}.png`; - + addDebugMessage('info', 'Sending generation request to images.ts backend', { prompt: promptText, files: filePaths, dst: genDst }); - + // Send generation request via Tauri command await tauriApi.generateImageViaBackend({ - prompt: promptText, + prompt: promptText, files: filePaths, dst: genDst }); - + addDebugMessage('info', '📤 Generation request sent to backend'); - + // Clear any existing timeout if (generationTimeoutId) { clearTimeout(generationTimeoutId); } - + const timeoutId = setTimeout(() => { addDebugMessage('warn', '⏰ Generation timeout - resetting state'); setIsGenerating(false); setFiles(prev => prev.filter(file => !file.path.startsWith('generating_'))); setGenerationTimeoutId(null); }, 30000); - + setGenerationTimeoutId(timeoutId); - + } catch (error) { addDebugMessage('error', 'Failed to send generation request', { error: error instanceof Error ? error.message : JSON.stringify(error) @@ -267,7 +267,7 @@ function App() { const toggleTheme = () => { const newDarkMode = !isDarkMode; setIsDarkMode(newDarkMode); - + if (newDarkMode) { document.documentElement.classList.add('dark'); localStorage.setItem('theme', 'dark'); @@ -292,13 +292,13 @@ function App() { }, []); async function submit() { - + if (apiKey) { // Generate image via backend (always chat mode now) // Use selected images if any, otherwise use all files const selectedImages = getSelectedImages(); const imagesToUse = selectedImages.length > 0 ? selectedImages : files.filter(f => !f.path.startsWith('generating_')); - + await generateImage(prompt, imagesToUse); // Don't clear prompt - let user iterate } else { @@ -309,17 +309,17 @@ function App() { const clearDebugMessages = async () => { setDebugMessages([]); await tauriApi.clearDebugMessages(); - addDebugMessage('info', 'Debug messages cleared'); + addDebugMessage('info', 'Debug messages cleared'); }; const sendIPCMessage = async (messageType: string, data: any) => { await tauriApi.sendIPCMessage(messageType, data); - addDebugMessage('info', `IPC message sent: ${messageType}`, data); + addDebugMessage('info', `IPC message sent: ${messageType}`, data); }; const sendMessageToImages = async () => { if (!messageToSend.trim()) return; - + const message = { message: messageToSend, timestamp: Date.now(), @@ -333,7 +333,7 @@ function App() { const errorMessage = error instanceof Error ? error.message : JSON.stringify(error); addDebugMessage('error', `Failed to send message: ${errorMessage}`); } - + // Clear the input setMessageToSend(''); }; @@ -351,7 +351,7 @@ function App() { const fileArray = Array.from(target.files); const newImageFiles: ImageFile[] = []; let loadedCount = 0; - + fileArray.forEach(file => { const reader = new FileReader(); reader.onload = (e) => { @@ -373,13 +373,13 @@ function App() { input.click(); return; } - + try { if (!tauriApi.dialog.open) { console.error('Open function not available'); return; } - + const selected = await tauriApi.dialog.open({ multiple: true, filters: [{ @@ -391,7 +391,7 @@ function App() { addFiles(selected); } } catch (e) { - console.error('File picker error:', e); + console.error('File picker error:', e); tauriApi.logErrorToConsole(`[Frontend Error] File picker error: ${JSON.stringify(e)}`); } } @@ -400,7 +400,7 @@ function App() { try { // Extract current filename from dst for default, or use smart default const currentFilename = dst.split(/[/\\]/).pop() || generateDefaultDst(files.length, files[0]?.path); - + const selected = await tauriApi.dialog.save({ defaultPath: currentFilename, filters: [{ @@ -408,12 +408,12 @@ function App() { extensions: ['png', 'jpg'] }] }); - + if (selected) { setDst(selected); } } catch (e) { - console.error('Save dialog error:', e); + console.error('Save dialog error:', e); tauriApi.logErrorToConsole(`[Frontend Error] Save dialog error: ${JSON.stringify(e)}`); } } @@ -425,7 +425,7 @@ function App() {
- +
{/* Debug Panel */} diff --git a/packages/kbot/gui/tauri-app/src/components/ImageGallery.tsx b/packages/kbot/gui/tauri-app/src/components/ImageGallery.tsx index 97536bb0..25db5cb7 100644 --- a/packages/kbot/gui/tauri-app/src/components/ImageGallery.tsx +++ b/packages/kbot/gui/tauri-app/src/components/ImageGallery.tsx @@ -5,6 +5,7 @@ interface ImageGalleryProps { images: ImageFile[]; onImageSelect?: (imagePath: string) => void; onImageRemove?: (imagePath: string) => void; + onImageDelete?: (imagePath: string) => void; showSelection?: boolean; } @@ -12,6 +13,7 @@ export default function ImageGallery({ images, onImageSelect, onImageRemove, + onImageDelete, showSelection = false }: ImageGalleryProps) { const [currentIndex, setCurrentIndex] = useState(0); @@ -74,10 +76,12 @@ export default function ImageGallery({ setCurrentIndex(index); // If it's a generated image and selection is enabled, also toggle selection + /* const isGenerated = imagePath.startsWith('generated_'); - if (showSelection && isGenerated && onImageSelect) { + if (showSelection && onImageSelect) { onImageSelect(imagePath); } + */ }; if (images.length === 0) { @@ -202,11 +206,29 @@ export default function ImageGallery({ onImageRemove(image.path); }} className="absolute top-1 right-1 bg-red-500/90 hover:bg-red-600 text-white rounded-full w-5 h-5 flex items-center justify-center text-xs opacity-0 group-hover:opacity-100 transition-all duration-200" - title="Remove" + title="Remove from view" > × )} + + {/* Delete button (permanent) */} + {!thumbIsGenerating && onImageDelete && ( + + )} ); })} diff --git a/packages/kbot/gui/tauri-app/src/components/PromptForm.tsx b/packages/kbot/gui/tauri-app/src/components/PromptForm.tsx index 755b5cb4..c5765019 100644 --- a/packages/kbot/gui/tauri-app/src/components/PromptForm.tsx +++ b/packages/kbot/gui/tauri-app/src/components/PromptForm.tsx @@ -18,6 +18,7 @@ interface PromptFormProps { saveAndClose: () => void; submit: () => void; addImageFromUrl: (url: string) => void; + onImageDelete?: (path: string) => void; } const PromptForm: React.FC = ({ @@ -36,7 +37,10 @@ const PromptForm: React.FC = ({ saveAndClose, submit, addImageFromUrl, + onImageDelete }) => { + const selectedCount = getSelectedImages().length; + return (
= ({

Images ({files.length}) - {getSelectedImages().length > 0 && ( + {selectedCount > 0 && ( - • {getSelectedImages().length} selected + • {selectedCount} selected )}

@@ -137,6 +141,7 @@ const PromptForm: React.FC = ({ onImageSelect={toggleImageSelection} onImageRemove={removeFile} showSelection={true} + onImageDelete={onImageDelete} />
diff --git a/packages/kbot/gui/tauri-app/src/constants.ts b/packages/kbot/gui/tauri-app/src/constants.ts index dd2f2bd9..30c4823a 100644 --- a/packages/kbot/gui/tauri-app/src/constants.ts +++ b/packages/kbot/gui/tauri-app/src/constants.ts @@ -11,6 +11,7 @@ export enum TauriCommand { CLEAR_DEBUG_MESSAGES = 'clear_debug_messages', SEND_IPC_MESSAGE = 'send_ipc_message', SEND_MESSAGE_TO_STDOUT = 'send_message_to_stdout', + REQUEST_FILE_DELETION = 'request_file_deletion', } export enum TauriEvent { @@ -18,4 +19,6 @@ export enum TauriEvent { IMAGE_RECEIVED = 'image-received', GENERATION_ERROR = 'generation-error', GENERATION_COMPLETE = 'generation-complete', + FILE_DELETED_SUCCESSFULLY = 'file-deleted-successfully', + FILE_DELETION_ERROR = 'file-deletion-error', } diff --git a/packages/kbot/gui/tauri-app/src/hooks/useTauriListeners.ts b/packages/kbot/gui/tauri-app/src/hooks/useTauriListeners.ts index 15e69b42..9f3d5a3c 100644 --- a/packages/kbot/gui/tauri-app/src/hooks/useTauriListeners.ts +++ b/packages/kbot/gui/tauri-app/src/hooks/useTauriListeners.ts @@ -31,114 +31,126 @@ export function useTauriListeners({ prompt }: TauriListenersProps) { useEffect(() => { - const initializeApp = async () => { + let unlistenConfig: (() => void) | undefined; + let unlistenImage: (() => void) | undefined; + let unlistenError: (() => void) | undefined; + let unlistenComplete: (() => void) | undefined; + let unlistenDeleted: (() => void) | undefined; + let unlistenDeleteError: (() => void) | undefined; + + const setupListeners = async () => { await tauriApi.ensureTauriApi(); if (tauriApi.isTauri()) { addDebugMessage('info', 'IPC system initialized successfully'); } - const setupTauriEventListeners = async () => { - if (tauriApi.isTauri()) { - try { - await tauriApi.listen(TauriEvent.CONFIG_RECEIVED, (event: any) => { - const data = event.payload; - if (data.prompt) setPrompt(data.prompt); - if (data.dst) setDst(data.dst); - if (data.apiKey) setApiKey(data.apiKey); - setIpcInitialized(true); - addDebugMessage('info', '📨 Config received from images.ts', { - hasPrompt: !!data.prompt, - hasDst: !!data.dst, - hasApiKey: !!data.apiKey, - fileCount: data.files?.length || 0, - }); - }); + const listeners = await Promise.all([ + tauriApi.listen(TauriEvent.CONFIG_RECEIVED, (event: any) => { + const data = event.payload; + if (data.prompt) setPrompt(data.prompt); + if (data.dst) setDst(data.dst); + if (data.apiKey) setApiKey(data.apiKey); + setIpcInitialized(true); + addDebugMessage('info', '📨 Config received from images.ts', { + hasPrompt: !!data.prompt, + hasDst: !!data.dst, + hasApiKey: !!data.apiKey, + fileCount: data.files?.length || 0, + }); + }), + tauriApi.listen(TauriEvent.IMAGE_RECEIVED, (event: any) => { + const imageData = event.payload; + addDebugMessage('debug', '🖼️ Processing image data', { + filename: imageData.filename, + mimeType: imageData.mimeType, + base64Length: imageData.base64?.length, + hasValidData: !!(imageData.base64 && imageData.mimeType && imageData.filename), + }); - await tauriApi.listen(TauriEvent.IMAGE_RECEIVED, (event: any) => { - const imageData = event.payload; - addDebugMessage('debug', '🖼️ Processing image data', { - filename: imageData.filename, - mimeType: imageData.mimeType, - base64Length: imageData.base64?.length, - hasValidData: !!(imageData.base64 && imageData.mimeType && imageData.filename), + if (imageData.base64 && imageData.mimeType && imageData.filename) { + const src = `data:${imageData.mimeType};base64,${imageData.base64}`; + const hasGeneratingPlaceholder = document.querySelector('[src^="data:image/svg+xml"]'); // A bit hacky, but avoids depending on files state + const isGeneratedImage = isGenerating || hasGeneratingPlaceholder || imageData.filename.includes('_out') || imageData.filename.includes('generated_'); + + if (isGeneratedImage) { + const generatedImageFile: ImageFile = { path: `generated_${imageData.filename}`, src }; + setFiles(prev => { + const withoutPlaceholder = prev.filter(file => !file.path.startsWith('generating_') && !file.path.endsWith(imageData.filename) && file.path !== `generated_${imageData.filename}`); + return [...withoutPlaceholder, generatedImageFile]; }); - if (imageData.base64 && imageData.mimeType && imageData.filename) { - const src = `data:${imageData.mimeType};base64,${imageData.base64}`; - const hasGeneratingPlaceholder = document.querySelector('[src^="data:image/svg+xml"]'); // A bit hacky, but avoids depending on files state - const isGeneratedImage = isGenerating || hasGeneratingPlaceholder || imageData.filename.includes('_out') || imageData.filename.includes('generated_'); - - if (isGeneratedImage) { - const generatedImageFile: ImageFile = { path: `generated_${imageData.filename}`, src }; - setFiles(prev => { - const withoutPlaceholder = prev.filter(file => !file.path.startsWith('generating_') && !file.path.endsWith(imageData.filename) && file.path !== `generated_${imageData.filename}`); - return [...withoutPlaceholder, generatedImageFile]; - }); - - if (generationTimeoutId) { - clearTimeout(generationTimeoutId); - setGenerationTimeoutId(null); - } - setIsGenerating(false); - addDebugMessage('info', '✅ Generated image added to files', { filename: imageData.filename, prompt }); - } else { - const newImageFile = { path: imageData.filename, src }; - setFiles(prevFiles => { - const exists = prevFiles.some(f => f.path === imageData.filename); - if (!exists) { - addDebugMessage('info', `📁 Adding input image: ${imageData.filename}`); - return [...prevFiles, newImageFile]; - } - addDebugMessage('warn', `🔄 Image already exists: ${imageData.filename}`); - return prevFiles; - }); - } - } else { - addDebugMessage('error', '❌ Invalid image data received', { - hasBase64: !!imageData.base64, - hasMimeType: !!imageData.mimeType, - hasFilename: !!imageData.filename, - }); + if (generationTimeoutId) { + clearTimeout(generationTimeoutId); + setGenerationTimeoutId(null); } - }); - - await tauriApi.listen(TauriEvent.GENERATION_ERROR, (event: any) => { - const errorData = event.payload; - addDebugMessage('error', '❌ Generation failed', errorData); setIsGenerating(false); - setFiles(prev => prev.filter(file => !file.path.startsWith('generating_'))); - }); - - await tauriApi.listen(TauriEvent.GENERATION_COMPLETE, (event: any) => { - const completionData = event.payload; - addDebugMessage('info', '✅ Simple mode: Image generation completed', { - dst: completionData.dst, - prompt: completionData.prompt - }); - setIsGenerating(false); - setFiles(prev => prev.filter(file => !file.path.startsWith('generating_'))); - }); - - addDebugMessage('info', 'Tauri event listeners set up'); - - try { - await tauriApi.requestConfigFromImages(); - addDebugMessage('info', 'Config request sent to images.ts'); - } catch (e) { - addDebugMessage('error', `Failed to request config: ${e}`); + addDebugMessage('info', '✅ Generated image added to files', { filename: imageData.filename, prompt }); + } else { + const newImageFile = { path: imageData.filename, src }; + setFiles(prevFiles => { + const exists = prevFiles.some(f => f.path === imageData.filename); + if (!exists) { + addDebugMessage('info', `📁 Adding input image: ${imageData.filename}`); + return [...prevFiles, newImageFile]; + } + addDebugMessage('warn', `🔄 Image already exists: ${imageData.filename}`); + return prevFiles; + }); } - } catch (error) { - addDebugMessage('error', `Failed to set up event listeners: ${error}`); + } else { + addDebugMessage('error', '❌ Invalid image data received', { + hasBase64: !!imageData.base64, + hasMimeType: !!imageData.mimeType, + hasFilename: !!imageData.filename, + }); } - } else { - addDebugMessage('warn', 'Tauri event listeners not available - running in browser mode'); - } - }; + }), + tauriApi.listen(TauriEvent.GENERATION_ERROR, (event: any) => { + const errorData = event.payload; + addDebugMessage('error', '❌ Generation failed', errorData); + setIsGenerating(false); + setFiles(prev => prev.filter(file => !file.path.startsWith('generating_'))); + }), + tauriApi.listen(TauriEvent.GENERATION_COMPLETE, (event: any) => { + const completionData = event.payload; + addDebugMessage('info', '✅ Simple mode: Image generation completed', { + dst: completionData.dst, + prompt: completionData.prompt + }); + setIsGenerating(false); + setFiles(prev => prev.filter(file => !file.path.startsWith('generating_'))); + }), + tauriApi.listen(TauriEvent.FILE_DELETED_SUCCESSFULLY, (event: any) => { + const deletedPath = event.payload.path; + addDebugMessage('info', `✅ File deleted successfully: ${deletedPath}`); + setFiles(prevFiles => prevFiles.filter(file => file.path !== deletedPath)); + }), + tauriApi.listen(TauriEvent.FILE_DELETION_ERROR, (event: any) => { + const { path, error } = event.payload; + addDebugMessage('error', `Failed to delete file: ${path}`, { error }); + }) + ]); - setTimeout(setupTauriEventListeners, 500); + [unlistenConfig, unlistenImage, unlistenError, unlistenComplete, unlistenDeleted, unlistenDeleteError] = listeners; + + try { + await tauriApi.requestConfigFromImages(); + addDebugMessage('info', 'Config request sent to images.ts'); + } catch (e) { + addDebugMessage('error', `Failed to request config: ${e}`); + } }; - setTimeout(initializeApp, 200); + setupListeners(); + + return () => { + unlistenConfig?.(); + unlistenImage?.(); + unlistenError?.(); + unlistenComplete?.(); + unlistenDeleted?.(); + unlistenDeleteError?.(); + }; }, []); // Empty dependency array to run only once on mount } diff --git a/packages/kbot/gui/tauri-app/src/lib/tauriApi.ts b/packages/kbot/gui/tauri-app/src/lib/tauriApi.ts index 33ce6977..8afa34a0 100644 --- a/packages/kbot/gui/tauri-app/src/lib/tauriApi.ts +++ b/packages/kbot/gui/tauri-app/src/lib/tauriApi.ts @@ -141,4 +141,6 @@ export const tauriApi = { sendIPCMessage: (messageType: string, data: any) => safeInvoke(TauriCommand.SEND_IPC_MESSAGE, { messageType, data }), + requestFileDeletion: (data: { path: string }) => + safeInvoke(TauriCommand.REQUEST_FILE_DELETION, data), }; diff --git a/packages/kbot/gui/tauri-app/tsconfig.json b/packages/kbot/gui/tauri-app/tsconfig.json index 9bdaa778..7604d620 100644 --- a/packages/kbot/gui/tauri-app/tsconfig.json +++ b/packages/kbot/gui/tauri-app/tsconfig.json @@ -16,8 +16,8 @@ /* Linting */ "strict": true, - "noUnusedLocals": true, - "noUnusedParameters": true, + "noUnusedLocals": false, + "noUnusedParameters": false, "noFallthroughCasesInSwitch": true }, "include": ["src"], diff --git a/packages/kbot/src/commands/images.ts b/packages/kbot/src/commands/images.ts index aa6b1f41..bdad6dba 100644 --- a/packages/kbot/src/commands/images.ts +++ b/packages/kbot/src/commands/images.ts @@ -2,7 +2,11 @@ import { z } from 'zod'; import * as path from 'node:path'; import { sync as write } from '@polymech/fs/write'; import { sync as exists } from '@polymech/fs/exists'; -import { readFileSync } from 'node:fs'; +import { + readFileSync, + statSync, + unlinkSync +} from 'node:fs'; import { variables } from '../variables.js'; import { resolve } from '@polymech/commons'; @@ -162,7 +166,7 @@ async function launchGuiAndGetPrompt(argv: any): Promise { cmd: 'forward_image_to_frontend', base64, mimeType, - filename + filename: imagePath }; tauriProcess.stdin?.write(JSON.stringify(imageResponse) + '\n'); @@ -172,6 +176,40 @@ async function launchGuiAndGetPrompt(argv: any): Promise { logger.error(`Failed to send image: ${imagePath}`, error.message); } } + } else if (message.type === 'delete_request') { + logger.info('📨 Received delete request from GUI'); + const pathToDelete = message.path; + if (pathToDelete && isString(pathToDelete)) { + try { + if (exists(pathToDelete)) { + unlinkSync(pathToDelete); + logger.info(`✅ File deleted successfully: ${pathToDelete}`); + const successResponse = { + cmd: 'file_deleted_successfully', + path: pathToDelete + }; + tauriProcess.stdin?.write(JSON.stringify(successResponse) + '\n'); + } else { + logger.warn(`⚠️ File not found for deletion: ${pathToDelete}`); + const errorResponse = { + cmd: 'file_deletion_error', + path: pathToDelete, + error: 'File not found on server.' + }; + tauriProcess.stdin?.write(JSON.stringify(errorResponse) + '\n'); + } + } catch (error) { + logger.error(`❌ Failed to delete file: ${pathToDelete}`, error.message); + const errorResponse = { + cmd: 'file_deletion_error', + path: pathToDelete, + error: error.message + }; + tauriProcess.stdin?.write(JSON.stringify(errorResponse) + '\n'); + } + } else { + logger.error('Invalid delete request from GUI, path is missing.'); + } } else if (message.type === 'generate_request') { logger.info('📨 Received generation request from GUI'); @@ -179,7 +217,33 @@ async function launchGuiAndGetPrompt(argv: any): Promise { try { const genPrompt = message.prompt; const genFiles = message.files || []; - const genDst = message.dst; + + // --- New logic for destination path --- + let dstDir: string; + + if (argv.dst) { + const absoluteDst = path.resolve(argv.dst); + const dstStat = exists(absoluteDst) ? statSync(absoluteDst) : null; + if (dstStat && dstStat.isDirectory()) { + dstDir = absoluteDst; + } else { + dstDir = path.dirname(absoluteDst); + } + } else if (genFiles.length > 0) { + dstDir = path.dirname(genFiles[0]); + } else { + dstDir = process.cwd(); // fallback to current working dir + } + + const baseFileName = genFiles.length > 0 + ? path.basename(genFiles[0], path.extname(genFiles[0])) + : 'generated'; + + const newFileName = `${baseFileName}_gen_0.png`; + + const finalDstPath = path.resolve(dstDir, newFileName); + logger.info(`📝 Determined destination path for generated image: ${finalDstPath}`); + // --- End new logic --- logger.info(`🎨 Starting image generation: "${genPrompt}"`); @@ -192,7 +256,7 @@ async function launchGuiAndGetPrompt(argv: any): Promise { ...argv, prompt: genPrompt, include: genFiles, - dst: genDst + dst: finalDstPath // Use the new path }); imageBuffer = await editImage(genPrompt, genFiles, parsedOptions); } else { @@ -201,12 +265,15 @@ async function launchGuiAndGetPrompt(argv: any): Promise { const parsedOptions = ImageOptionsSchema().parse({ ...argv, prompt: genPrompt, - dst: genDst + dst: finalDstPath // Use the new path }); imageBuffer = await createImage(genPrompt, parsedOptions); } if (imageBuffer) { + write(finalDstPath, imageBuffer); + logger.info(`✅ Image saved to: ${finalDstPath}`); + // Send the generated image back to the GUI (chat mode) const base64Result = imageBuffer.toString('base64'); @@ -214,11 +281,11 @@ async function launchGuiAndGetPrompt(argv: any): Promise { cmd: 'forward_image_to_frontend', base64: base64Result, mimeType: 'image/png', - filename: path.basename(genDst) + filename: finalDstPath }; tauriProcess.stdin?.write(JSON.stringify(imageResponse) + '\n'); - logger.info(`✅ Generated image sent to GUI: ${genDst}`); + logger.info(`✅ Generated image sent to GUI: ${path.basename(finalDstPath)}`); } else { logger.error('❌ Failed to generate image'); diff --git a/packages/kbot/tests/assets/DSC05427.JPG b/packages/kbot/tests/assets/DSC05427.JPG new file mode 100644 index 00000000..fe3c2937 Binary files /dev/null and b/packages/kbot/tests/assets/DSC05427.JPG differ diff --git a/packages/kbot/tests/assets/DSC05427_gen_0.png b/packages/kbot/tests/assets/DSC05427_gen_0.png new file mode 100644 index 00000000..f0c8f6fc Binary files /dev/null and b/packages/kbot/tests/assets/DSC05427_gen_0.png differ diff --git a/packages/kbot/tests/assets/MOMO_1704489700094.png b/packages/kbot/tests/assets/MOMO_1704489700094.png new file mode 100644 index 00000000..a5b9c3c1 Binary files /dev/null and b/packages/kbot/tests/assets/MOMO_1704489700094.png differ diff --git a/packages/kbot/tests/assets/katfucked.jpg b/packages/kbot/tests/assets/katfucked.jpg new file mode 100644 index 00000000..7391cd7b Binary files /dev/null and b/packages/kbot/tests/assets/katfucked.jpg differ diff --git a/packages/kbot/tests/assets/m1.jpg b/packages/kbot/tests/assets/m1.jpg new file mode 100644 index 00000000..87c199e7 Binary files /dev/null and b/packages/kbot/tests/assets/m1.jpg differ diff --git a/packages/kbot/tests/assets/m1_gen_0.png b/packages/kbot/tests/assets/m1_gen_0.png new file mode 100644 index 00000000..661da3d7 Binary files /dev/null and b/packages/kbot/tests/assets/m1_gen_0.png differ diff --git a/packages/kbot/tests/assets/m2.jpg b/packages/kbot/tests/assets/m2.jpg new file mode 100644 index 00000000..acc5e774 Binary files /dev/null and b/packages/kbot/tests/assets/m2.jpg differ diff --git a/packages/kbot/tests/assets/m2_gen_0.png b/packages/kbot/tests/assets/m2_gen_0.png new file mode 100644 index 00000000..9d47d1ee Binary files /dev/null and b/packages/kbot/tests/assets/m2_gen_0.png differ diff --git a/packages/kbot/tests/assets/replicate-prediction-z59addc6b1rmc0crk3386vchrr.jpg b/packages/kbot/tests/assets/replicate-prediction-z59addc6b1rmc0crk3386vchrr.jpg new file mode 100644 index 00000000..852c1796 Binary files /dev/null and b/packages/kbot/tests/assets/replicate-prediction-z59addc6b1rmc0crk3386vchrr.jpg differ