iatoolkit 1.9.0__py3-none-any.whl → 1.15.3__py3-none-any.whl

iatoolkit/services/query_service.py

@@ -99,7 +99,7 @@ class QueryService:
         final_client_data.update(client_data)
 
         # Load attached files into the context
-        files_context = self.load_files_for_context(files)
+        files_context, images = self.load_files_for_context(files)
 
         # Initialize prompt_content. It will be an empty string for direct questions.
         main_prompt = ""
@@ -128,7 +128,7 @@ class QueryService:
         else:
             user_turn_prompt += f'\n### Contexto Adicional: El usuario ha aportado este contexto puede ayudar: {effective_question}'
 
-        return user_turn_prompt, effective_question
+        return user_turn_prompt, effective_question, images
 
     def _ensure_valid_history(self, company,
                               user_identifier: str,
@@ -356,7 +356,7 @@ class QueryService:
             effective_model = self._resolve_model(company_short_name, model)
 
             # --- Build User-Facing Prompt ---
-            user_turn_prompt, effective_question = self._build_user_facing_prompt(
+            user_turn_prompt, effective_question, images = self._build_user_facing_prompt(
                 company=company,
                 user_identifier=user_identifier,
                 client_data=client_data,
@@ -397,7 +397,8 @@ class QueryService:
                 question=effective_question,
                 context=user_turn_prompt,
                 tools=tools,
-                text=output_schema
+                text=output_schema,
+                images=images,
             )
 
             if not response.get('valid_response'):
@@ -421,24 +422,23 @@ class QueryService:
             return "unknown"
 
 
-    def load_files_for_context(self, files: list) -> str:
+    def load_files_for_context(self, files: list) -> tuple[str, list]:
         """
-        Processes a list of attached files, decodes their content,
-        and formats them into a string context for the LLM.
+        Processes a list of attached files.
+        Decodes text documents into context string and separates images for multimodal processing.
         """
         if not files:
-            return ''
+            return '', []
+
+        context_parts = []
+        images = []
+        text_files_count = 0
 
-        context = f"""
-            A continuación encontraras una lista de documentos adjuntos
-            enviados por el usuario que hace la pregunta, 
-            en total son: {len(files)} documentos adjuntos
-            """
         for document in files:
             # Support both 'file_id' and 'filename' for robustness
             filename = document.get('file_id') or document.get('filename') or document.get('name')
             if not filename:
-                context += "\n<error>Documento adjunto sin nombre ignorado.</error>\n"
+                context_parts.append("\n<error>Documento adjunto sin nombre ignorado.</error>\n")
                 continue
 
             # Support both 'base64' and 'content' for robustness
@@ -446,7 +446,12 @@ class QueryService:
 
             if not base64_content:
                 # Handles the case where a file is referenced but no content is provided
-                context += f"\n<error>El archivo '{filename}' no fue encontrado y no pudo ser cargado.</error>\n"
+                context_parts.append(f"\n<error>El archivo '{filename}' no fue encontrado y no pudo ser cargado.</error>\n")
+                continue
+
+            # Detect if the file is an image
+            if self._is_image(filename):
+                images.append({'name': filename, 'base64': base64_content})
                 continue
 
             try:
@@ -456,12 +461,26 @@ class QueryService:
 
                 file_content = base64.b64decode(base64_content)
                 document_text = self.document_service.file_to_txt(filename, file_content)
-                context += f"\n<document name='{filename}'>\n{document_text}\n</document>\n"
+                context_parts.append(f"\n<document name='{filename}'>\n{document_text}\n</document>\n")
+                text_files_count += 1
             except Exception as e:
                 # Catches errors from b64decode or file_to_txt
                 logging.error(f"Failed to process file {filename}: {e}")
-                context += f"\n<error>Error al procesar el archivo {filename}: {str(e)}</error>\n"
+                context_parts.append(f"\n<error>Error al procesar el archivo {filename}: {str(e)}</error>\n")
                 continue
 
-        return context
+        context = ""
+        if text_files_count > 0:
+            context = f"""
+            A continuación encontraras una lista de documentos adjuntos
+            enviados por el usuario que hace la pregunta, 
+            en total son: {text_files_count} documentos adjuntos
+            """ + "".join(context_parts)
+        elif context_parts:
+            # If only errors were collected
+            context = "".join(context_parts)
+
+        return context, images
 
+    def _is_image(self, filename: str) -> bool:
+        return filename.lower().endswith(('.png', '.jpg', '.jpeg', '.webp', '.gif'))

iatoolkit/services/storage_service.py

@@ -0,0 +1,92 @@
+# Copyright (c) 2024 Fernando Libedinsky
+# Product: IAToolkit
+#
+# IAToolkit is open source software.
+
+import base64
+import uuid
+import logging
+import mimetypes
+import os
+from injector import inject
+from typing import Dict
+from iatoolkit.infra.connectors.s3_connector import S3Connector
+from iatoolkit.common.exceptions import IAToolkitException
+
+
+class StorageService:
+    """
+    High level service for managing assets storage (images generated, attachments, etc).
+    Provides abstraction for file decoding and naming.
+    """
+
+    @inject
+    def __init__(self):
+        self.connector = self._init_connector()
+
+    def _init_connector(self) -> S3Connector:
+        # We configure S3 directly using environment variables
+        bucket = os.getenv("S3_BUCKET_NAME", "iatoolkit-assets")
+
+        auth = {
+            'aws_access_key_id': os.getenv('AWS_ACCESS_KEY_ID'),
+            'aws_secret_access_key': os.getenv('AWS_SECRET_ACCESS_KEY'),
+            'region_name': os.getenv('AWS_REGION', 'us-east-1')
+        }
+
+        return S3Connector(
+            bucket=bucket,
+            prefix="",   # Empty prefix to allow full control over keys
+            folder="",
+            auth=auth
+        )
+
+    def store_generated_image(self, company_short_name: str, base64_data: str, mime_type: str) -> Dict[str, str]:
+        """
+        Guarda una imagen generada por LLM (Base64) en el storage.
+
+        Returns:
+            Dict con:
+            - 'storage_key': La ruta interna (para guardar en BD)
+            - 'url': La URL firmada (para devolver al frontend inmediatamente)
+        """
+        try:
+            # 1. Decode Base64
+            # Sometimes the string comes with header 'data:image/png;base64,...', clean it
+            if "base64," in base64_data:
+                base64_data = base64_data.split("base64,")[1]
+
+            image_bytes = base64.b64decode(base64_data)
+
+            # 2. Generate unique name
+            ext = mimetypes.guess_extension(mime_type) or ".png"
+            filename = f"{uuid.uuid4()}{ext}"
+
+            # 3. Define folder structure: companies/{company}/generated/{filename}
+            storage_key = f"companies/{company_short_name}/generated_images/{filename}"
+
+            # 4. Upload
+            self.connector.upload_file(
+                file_path=storage_key,
+                content=image_bytes,
+                content_type=mime_type
+            )
+
+            logging.info(f"Generated image saved at: {storage_key}")
+
+            # 5. Generate temporary URL
+            url = self.connector.generate_presigned_url(storage_key)
+
+            return {
+                "storage_key": storage_key,
+                "url": url
+            }
+
+        except Exception as e:
+            error_msg = f"Error saving image to Storage: {str(e)}"
+            logging.error(error_msg)
+            raise IAToolkitException(IAToolkitException.ErrorType.FILE_IO_ERROR, error_msg)
+
+    def get_public_url(self, storage_key: str) -> str:
+        """Gets a fresh signed URL for an existing resource."""
+        return self.connector.generate_presigned_url(storage_key)

iatoolkit/static/js/chat_filepond.js

@@ -1,85 +1,210 @@
-$(document).ready(function () {
-    const paperclipButton = $('#paperclip-button');
-    const viewFilesButtonContainer = $('#view-files-button-container');
-    const viewFilesButton = $('#view-files-button');
-    const uploadedFilesModalElement = $('#uploadedFilesModal');
-    const uploadedFilesModal = uploadedFilesModalElement;  // En Bootstrap 3, el elemento jQuery es el modal
-    const uploadedFilesList = $('#uploaded-files-list');
-
-    // Initialize FilePond
-    window.filePond = FilePond.create(
-        document.querySelector('#file-upload'), {
+document.addEventListener('DOMContentLoaded', function () {
+    // 1. Register FilePond Plugins
+    // Ensure plugin scripts are loaded in your base layout or template
+    if (typeof FilePondPluginFileEncode !== 'undefined') {
+        FilePond.registerPlugin(FilePondPluginFileEncode);
+    }
+    if (typeof FilePondPluginFileValidateSize !== 'undefined') {
+        FilePond.registerPlugin(FilePondPluginFileValidateSize);
+    }
+    if (typeof FilePondPluginFileValidateType !== 'undefined') {
+        FilePond.registerPlugin(FilePondPluginFileValidateType);
+    }
+    if (typeof FilePondPluginImagePreview !== 'undefined') {
+        FilePond.registerPlugin(FilePondPluginImagePreview);
+    }
+
+    // 2. Create FilePond instance on the hidden input
+    const inputElement = document.querySelector('input.filepond');
+
+    // FilePond base configuration
+    const filePond = FilePond.create(inputElement, {
         allowMultiple: true,
-        labelIdle: '',
+        maxFiles: 5,
+        maxFileSize: '30MB',
+
+        // Extensive list of accepted types (Images, PDF, Text, Excel, Word)
+        acceptedFileTypes: [
+            'image/*',
+            'application/pdf',
+            'text/plain',
+            'text/csv',
+            'application/vnd.ms-excel',                                                 // .xls
+            'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',        // .xlsx
+            'application/msword',                                                       // .doc
+            'application/vnd.openxmlformats-officedocument.wordprocessingml.document'   // .docx
+        ],
+        labelIdle: '', // Left empty because we use our own UI
         credits: false,
-        allowFileSizeValidation: true,
-        maxFileSize: '10MB',
-        stylePanelLayout: null,
-        itemInsertLocation: 'after',
-        instantUpload: false,
+        storeAsFile: true, // Important for encode to work if used
     });
 
-    $('.filepond--root').hide(); // Ocultar la UI de FilePond
+    // Expose globally so chat_main.js can access (getFiles, removeFiles)
+    window.filePond = filePond;
+
+
+    // 3. DOM references for the new custom UI
+    const dropzone = document.getElementById('chat-dropzone');
+    const fileListContainer = document.getElementById('inline-file-list');
+    const fileCounter = document.getElementById('file-counter');
+    const paperclipBtn = document.getElementById('paperclip-button');
+
+
+    // 4. Rendering Functions
+
+    /**
+     * Returns the Bootstrap icon class based on filename or file type.
+     */
+    function getFileIconClass(filename, type) {
+        const ext = filename.split('.').pop().toLowerCase();
+
+        // Images
+        if (type.startsWith('image/') || ['jpg', 'jpeg', 'png', 'gif', 'webp', 'svg'].includes(ext)) {
+            return 'bi-file-earmark-image';
+        }
+        // PDF
+        if (type === 'application/pdf' || ext === 'pdf') {
+            return 'bi-file-earmark-pdf';
+        }
+        // Excel / Spreadsheets
+        if (['xls', 'xlsx', 'csv'].includes(ext) || type.includes('spreadsheet') || type.includes('excel')) {
+            return 'bi-file-earmark-excel';
+        }
+        // Word / Documents
+        if (['doc', 'docx'].includes(ext) || type.includes('word') || type.includes('document')) {
+            return 'bi-file-earmark-word';
+        }
+        // Text / Code
+        if (['txt', 'md', 'json', 'py', 'js', 'html', 'css'].includes(ext)) {
+            return 'bi-file-earmark-text';
+        }
+
+        // Default icon
+        return 'bi-file-earmark';
+    }
+
+    /**
+     * Rebuilds the visual file list below the input.
+     */
+    function renderFileList() {
+        if (!fileListContainer) return;
 
-    // Función para actualizar la visibilidad del icono "ver archivos"
-    function updateFileIconsVisibility() {
         const files = filePond.getFiles();
+        fileListContainer.innerHTML = ''; // Clear current list
+
         if (files.length > 0) {
-            viewFilesButtonContainer.show();
-        } else {
-            viewFilesButtonContainer.hide();
-            if (uploadedFilesModalElement.hasClass('in')) { // Si el modal está abierto y no hay archivos, ciérralo
-                uploadedFilesModal.modal('hide');
+            fileListContainer.style.display = 'block';
+
+            // Update counter
+            if (fileCounter) {
+                fileCounter.textContent = `${files.length}/${filePond.maxFiles || 5}`;
+                fileCounter.style.display = 'inline-block';
             }
+
+            files.forEach(fileItem => {
+                const file = fileItem.file;
+                const iconClass = getFileIconClass(file.name, file.type || '');
+
+                // Create file row
+                const row = document.createElement('div');
+                row.className = 'file-list-item';
+
+                row.innerHTML = `
+                    <i class="bi ${iconClass} file-icon"></i>
+                    <span class="file-name" title="${file.name}">${file.name}</span>
+                    <i class="bi bi-x-circle-fill file-remove" role="button" aria-label="Remove file"></i>
+                `;
+
+                // Click event on the remove button of the row
+                const removeBtn = row.querySelector('.file-remove');
+                removeBtn.addEventListener('click', (e) => {
+                    e.stopPropagation(); // Prevent click propagation if nested in a clickable area
+                    filePond.removeFile(fileItem.id);
+                });
+
+                fileListContainer.appendChild(row);
+            });
+        } else {
+            // Hide list and counter if no files
+            fileListContainer.style.display = 'none';
+            if (fileCounter) fileCounter.style.display = 'none';
         }
     }
 
-    // Función para poblar el modal con los archivos y botones de eliminar
-    function populateFilesModal() {
-        uploadedFilesList.empty(); // Limpiar lista anterior
-        const files = filePond.getFiles();
 
-        if (files.length === 0) {
-            uploadedFilesList.append('<li class="list-group-item">No hay archivos adjuntos.</li>');
-            return;
-        }
+    // 5. Interaction Event Management
 
-        files.forEach(file => {
-            const listItem = $(`
-                <li class="list-group-item d-flex justify-content-between align-items-center">
-                    <span class="file-name-modal">${file.filename}</span>
-                    <button type="button" class="btn btn-sm btn-outline-danger remove-file-btn" data-file-id="${file.id}" title="Eliminar archivo">
-                        <i class="bi bi-trash-fill"></i>
-                    </button>
-                </li>
-            `);
-            uploadedFilesList.append(listItem);
+    // -- Custom Dropzone Robust Handling --
+    if (dropzone) {
+        // Prevent default browser behavior for drag events
+        ['dragenter', 'dragover', 'dragleave', 'drop'].forEach(eventName => {
+            dropzone.addEventListener(eventName, (e) => {
+                e.preventDefault();
+                e.stopPropagation();
+            }, false);
+        });
+
+        // Highlight dropzone on drag enter/over
+        ['dragenter', 'dragover'].forEach(eventName => {
+            dropzone.addEventListener(eventName, () => {
+                dropzone.classList.add('drag-over');
+            }, false);
+        });
+
+        // Remove highlight on drag leave or drop
+        // Note: checking relatedTarget prevents flickering when dragging over child elements
+        dropzone.addEventListener('dragleave', (e) => {
+            if (!dropzone.contains(e.relatedTarget)) {
+                dropzone.classList.remove('drag-over');
+            }
+        }, false);
+
+        dropzone.addEventListener('drop', (e) => {
+            dropzone.classList.remove('drag-over');
+
+            // Pass dropped files to FilePond
+            // We convert FileList to Array to ensure compatibility
+            if (e.dataTransfer && e.dataTransfer.files.length > 0) {
+                filePond.addFiles(Array.from(e.dataTransfer.files));
+            }
+        }, false);
+
+        // Click on zone opens native selector
+        dropzone.addEventListener('click', function() {
+            filePond.browse();
+        });
+    }
+
+    // -- "Clip" Button (Legacy design compatibility) --
+    if (paperclipBtn) {
+        paperclipBtn.addEventListener('click', function() {
+            filePond.browse();
         });
     }
 
-        // Event listeners de FilePond
-    window.filePond.on('addfile', () => updateFileIconsVisibility());
-    window.filePond.on('removefile', () => {
-        updateFileIconsVisibility();
-        if (uploadedFilesModalElement.hasClass('in')) {
-            populateFilesModal();
+
+    // 6. FilePond Hooks for Reactivity
+
+    // On file add (even if validation error, FilePond manages array)
+    filePond.on('addfile', (error, file) => {
+        if (error) {
+            console.error('FilePond Error:', error);
+            // Optional: Show error toast if file is invalid (e.g., too large)
+            return;
         }
+        renderFileList();
     });
 
-    // Event listeners de los botones de la UI
-    paperclipButton.on('click', () => window.filePond.browse());
-    viewFilesButton.on('click', () => {
-        populateFilesModal();
-        uploadedFilesModal.modal('show');
-    });
-    uploadedFilesList.on('click', '.remove-file-btn', function () {
-        const fileIdToRemove = $(this).data('file-id');
-        if (fileIdToRemove) {
-            window.filePond.removeFile(fileIdToRemove);
-        }
+    // On file remove
+    filePond.on('removefile', (error, file) => {
+        renderFileList();
     });
 
-    // Inicializar visibilidad al cargar
-    updateFileIconsVisibility();
-});
+    // Event for general error (e.g., type not allowed on drop)
+    filePond.on('warning', (error) => {
+        console.warn('FilePond Warning:', error);
+    });
 
+    // Initialization: Initial render in case browser cached state
+    renderFileList();
+});