dtSpark 1.0.10__py3-none-any.whl → 1.1.0a1__py3-none-any.whl

dtSpark/web/endpoints/chat.py

@@ -252,9 +252,19 @@ async def command_info(
                     "tokens_sent": conv.get('tokens_sent', 0),
                     "tokens_received": conv.get('tokens_received', 0),
                     "total_tokens": conv.get('tokens_sent', 0) + conv.get('tokens_received', 0),
+                    "instructions": conv.get('instructions', ''),
                 },
                 "model_usage": model_usage,
                 "files": [f['filename'] for f in files],
+                "attached_files": [
+                    {
+                        "id": f['id'],
+                        "filename": f['filename'],
+                        "size_bytes": f.get('size_bytes', 0),
+                        "mime_type": f.get('mime_type', 'application/octet-stream'),
+                    }
+                    for f in files
+                ],
                 "mcp_servers": mcp_servers,
                 "rollup_settings": rollup_info,
             },
@@ -570,6 +580,143 @@ async def toggle_mcp_server(
         raise HTTPException(status_code=500, detail=str(e))
 
 
+@router.post("/chat/{conversation_id}/command/instructions")
+async def update_instructions(
+    request: Request,
+    conversation_id: int,
+    instructions: str = Form(""),
+    session_id: str = Depends(get_current_session),
+):
+    """
+    Update conversation instructions/system prompt.
+
+    Args:
+        request: FastAPI request
+        conversation_id: ID of the conversation
+        instructions: New instructions text (empty to clear)
+        session_id: Current session ID
+
+    Returns:
+        CommandResponse with status
+    """
+    try:
+        app_instance = request.app.state.app_instance
+
+        # Check if conversation is predefined
+        if app_instance.database.is_conversation_predefined(conversation_id):
+            return CommandResponse(
+                command="instructions",
+                status="error",
+                message="Cannot modify instructions for predefined conversations",
+                data=None,
+            )
+
+        # Set conversation context if needed
+        if app_instance.conversation_manager.current_conversation_id != conversation_id:
+            app_instance.conversation_manager.load_conversation(conversation_id)
+
+        # Update instructions (None to clear, or the text)
+        new_instructions = instructions.strip() if instructions.strip() else None
+        success = app_instance.conversation_manager.update_instructions(new_instructions)
+
+        if success:
+            return CommandResponse(
+                command="instructions",
+                status="success",
+                message="Instructions updated successfully",
+                data={"instructions": new_instructions},
+            )
+        else:
+            return CommandResponse(
+                command="instructions",
+                status="error",
+                message="Failed to update instructions",
+                data=None,
+            )
+
+    except Exception as e:
+        logger.error(f"Error updating instructions for conversation {conversation_id}: {e}")
+        raise HTTPException(status_code=500, detail=str(e))
+
+
+@router.post("/chat/{conversation_id}/command/deletefiles")
+async def delete_files(
+    request: Request,
+    conversation_id: int,
+    session_id: str = Depends(get_current_session),
+):
+    """
+    Delete attached files from a conversation.
+
+    Args:
+        request: FastAPI request
+        conversation_id: ID of the conversation
+        session_id: Current session ID
+
+    Returns:
+        CommandResponse with deletion status
+    """
+    try:
+        app_instance = request.app.state.app_instance
+
+        # Check if conversation is predefined
+        if app_instance.database.is_conversation_predefined(conversation_id):
+            return CommandResponse(
+                command="deletefiles",
+                status="error",
+                message="Cannot delete files from predefined conversations",
+                data=None,
+            )
+
+        # Parse JSON body for file_ids
+        body = await request.json()
+        file_ids = body.get('file_ids', [])
+
+        if not file_ids:
+            return CommandResponse(
+                command="deletefiles",
+                status="error",
+                message="No file IDs provided",
+                data=None,
+            )
+
+        # Delete each file
+        deleted_count = 0
+        failed_ids = []
+
+        for file_id in file_ids:
+            try:
+                if app_instance.database.delete_file(file_id):
+                    deleted_count += 1
+                else:
+                    failed_ids.append(file_id)
+            except Exception as e:
+                logger.warning(f"Failed to delete file {file_id}: {e}")
+                failed_ids.append(file_id)
+
+        if deleted_count > 0:
+            return CommandResponse(
+                command="deletefiles",
+                status="success",
+                message=f"Deleted {deleted_count} file(s)",
+                data={
+                    "deleted_count": deleted_count,
+                    "failed_ids": failed_ids,
+                },
+            )
+        else:
+            return CommandResponse(
+                command="deletefiles",
+                status="error",
+                message="Failed to delete files",
+                data={"failed_ids": failed_ids},
+            )
+
+    except Exception as e:
+        logger.error(f"Error deleting files for conversation {conversation_id}: {e}")
+        raise HTTPException(status_code=500, detail=str(e))
+
+
 @router.post("/chat/permission/respond")
 async def respond_to_permission_request(
     request: Request,

dtSpark/web/endpoints/main_menu.py

@@ -494,6 +494,81 @@ async def get_mcp_tools(
         raise HTTPException(status_code=500, detail=str(e))
 
 
+class EmbeddedToolInfo(BaseModel):
+    """Embedded tool information."""
+    name: str
+    description: str
+    category: str  # Core, Filesystem, Documents, Archives
+
+
+@router.get("/embedded-tools")
+async def get_embedded_tools(
+    request: Request,
+    session_id: str = Depends(get_current_session),
+) -> list[EmbeddedToolInfo]:
+    """
+    Get all embedded tools with their categories.
+
+    Returns:
+        List of EmbeddedToolInfo with tool details and categories
+    """
+    try:
+        app_instance = request.app.state.app_instance
+        tools = []
+
+        # Get embedded tools from conversation manager
+        if hasattr(app_instance, 'conversation_manager') and app_instance.conversation_manager:
+            try:
+                embedded = app_instance.conversation_manager.get_embedded_tools()
+                for tool in embedded:
+                    # Handle both Bedrock format (toolSpec) and Claude format (direct)
+                    if 'toolSpec' in tool:
+                        tool_spec = tool.get('toolSpec', {})
+                        name = tool_spec.get('name', 'unknown')
+                        description = tool_spec.get('description', '')
+                    else:
+                        name = tool.get('name', 'unknown')
+                        description = tool.get('description', '')
+
+                    # Determine category based on tool name
+                    category = _categorise_embedded_tool(name)
+
+                    tools.append(EmbeddedToolInfo(
+                        name=name,
+                        description=description,
+                        category=category,
+                    ))
+            except Exception as e:
+                logger.warning(f"Error getting embedded tools: {e}")
+
+        return tools
+
+    except Exception as e:
+        logger.error(f"Error getting embedded tools: {e}")
+        raise HTTPException(status_code=500, detail=str(e))
+
+
+def _categorise_embedded_tool(tool_name: str) -> str:
+    """Categorise an embedded tool based on its name."""
+    name_lower = tool_name.lower()
+
+    # Document tools
+    if any(kw in name_lower for kw in ['word', 'excel', 'powerpoint', 'pdf', 'document']):
+        return 'Documents'
+
+    # Archive tools
+    if any(kw in name_lower for kw in ['archive', 'zip', 'tar', 'extract']):
+        return 'Archives'
+
+    # Filesystem tools
+    if any(kw in name_lower for kw in ['file', 'directory', 'list_files', 'read_file',
+                                        'write_file', 'create_directory', 'search_files']):
+        return 'Filesystem'
+
+    # Default to Core
+    return 'Core'
+
+
 @router.get("/daemon/status")
 async def get_daemon_status(request: Request):
     """

dtSpark/web/templates/chat.html

@@ -114,12 +114,28 @@ document.getElementById('infoModal').addEventListener('show.bs.modal', function(
                     <button class="list-group-item list-group-item-action" onclick="executeCommand('export')">
                         <i class="bi bi-download"></i> Export Conversation
                     </button>
+                    <button class="list-group-item list-group-item-action" onclick="executeCommand('attach')">
+                        <i class="bi bi-paperclip"></i> Attach Files
+                    </button>
+                    <button class="list-group-item list-group-item-action" onclick="executeCommand('instructions')">
+                        <i class="bi bi-card-text"></i> Change Instructions
+                    </button>
+                    <button class="list-group-item list-group-item-action" onclick="executeCommand('copy')">
+                        <i class="bi bi-clipboard"></i> Copy Last Response
+                    </button>
                     <button class="list-group-item list-group-item-action" onclick="executeCommand('mcpaudit')">
                         <i class="bi bi-shield-check"></i> MCP Audit Log
                     </button>
                     <button class="list-group-item list-group-item-action" onclick="executeCommand('mcpservers')">
                         <i class="bi bi-hdd-network"></i> MCP Server Management
                     </button>
+                    <hr class="my-2">
+                    <button class="list-group-item list-group-item-action" onclick="executeCommand('deletefiles')">
+                        <i class="bi bi-file-earmark-x text-warning"></i> Delete Attached Files
+                    </button>
+                    <button class="list-group-item list-group-item-action text-danger" onclick="executeCommand('delete')">
+                        <i class="bi bi-trash"></i> Delete Conversation
+                    </button>
                 </div>
             </div>
         </div>
@@ -197,6 +213,21 @@ async function executeCommand(command) {
         case 'changemodel':
             await showChangeModelModal();
             break;
+        case 'attach':
+            await showAttachFilesModal();
+            break;
+        case 'instructions':
+            await showInstructionsModal();
+            break;
+        case 'copy':
+            await copyLastResponse();
+            break;
+        case 'deletefiles':
+            await showDeleteFilesModal();
+            break;
+        case 'delete':
+            await confirmDeleteConversation();
+            break;
         case 'mcpaudit':
             await showMCPAuditModal();
             break;
@@ -810,5 +841,274 @@ async function performAttachFiles() {
 function attachFiles() {
     showAttachFilesModal();
 }
+
+// Show instructions modal
+async function showInstructionsModal() {
+    try {
+        // Load current instructions
+        const response = await fetch(`/api/chat/${conversationId}/command/info`, {
+            method: 'POST'
+        });
+        const data = await response.json();
+        const currentInstructions = data.data.conversation.instructions || '';
+
+        const modalHTML = `
+            <div class="modal fade" id="instructionsModal" tabindex="-1">
+                <div class="modal-dialog modal-lg">
+                    <div class="modal-content">
+                        <div class="modal-header">
+                            <h5 class="modal-title"><i class="bi bi-card-text"></i> Change Instructions</h5>
+                            <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
+                        </div>
+                        <div class="modal-body">
+                            <div class="mb-3">
+                                <label for="instructions-text" class="form-label">System Instructions / Prompt</label>
+                                <textarea class="form-control" id="instructions-text" rows="10"
+                                    placeholder="Enter system instructions for this conversation...">${escapeHtml(currentInstructions)}</textarea>
+                                <div class="form-text">These instructions are sent as a system prompt with each message.</div>
+                            </div>
+                        </div>
+                        <div class="modal-footer">
+                            <button type="button" class="btn btn-outline-warning" onclick="clearInstructions()">
+                                <i class="bi bi-eraser"></i> Clear
+                            </button>
+                            <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
+                            <button type="button" class="btn btn-primary" onclick="saveInstructions()">
+                                <i class="bi bi-check-lg"></i> Save
+                            </button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        `;
+
+        // Remove old modal if exists
+        const oldModal = document.getElementById('instructionsModal');
+        if (oldModal) oldModal.remove();
+
+        document.body.insertAdjacentHTML('beforeend', modalHTML);
+        const modal = new bootstrap.Modal(document.getElementById('instructionsModal'));
+        modal.show();
+    } catch (error) {
+        showToast('Failed to load instructions', 'error');
+    }
+}
+
+async function saveInstructions() {
+    const instructions = document.getElementById('instructions-text').value;
+
+    try {
+        const formData = new FormData();
+        formData.append('instructions', instructions);
+
+        const response = await fetch(`/api/chat/${conversationId}/command/instructions`, {
+            method: 'POST',
+            body: formData
+        });
+
+        const data = await response.json();
+
+        if (data.status === 'success') {
+            bootstrap.Modal.getInstance(document.getElementById('instructionsModal')).hide();
+            showToast('Instructions updated successfully', 'success');
+        } else {
+            showToast(data.message || 'Failed to update instructions', 'error');
+        }
+    } catch (error) {
+        showToast('Failed to update instructions', 'error');
+    }
+}
+
+async function clearInstructions() {
+    if (!confirm('Are you sure you want to clear the instructions?')) return;
+
+    try {
+        const formData = new FormData();
+        formData.append('instructions', '');
+
+        const response = await fetch(`/api/chat/${conversationId}/command/instructions`, {
+            method: 'POST',
+            body: formData
+        });
+
+        const data = await response.json();
+
+        if (data.status === 'success') {
+            document.getElementById('instructions-text').value = '';
+            showToast('Instructions cleared', 'success');
+        } else {
+            showToast(data.message || 'Failed to clear instructions', 'error');
+        }
+    } catch (error) {
+        showToast('Failed to clear instructions', 'error');
+    }
+}
+
+// Copy last response to clipboard
+async function copyLastResponse() {
+    // Find the last assistant message in the chat
+    const chatContainer = document.getElementById('chat-container');
+    const assistantMessages = chatContainer.querySelectorAll('.assistant-message');
+
+    if (assistantMessages.length === 0) {
+        showToast('No assistant response to copy', 'warning');
+        return;
+    }
+
+    const lastMessage = assistantMessages[assistantMessages.length - 1];
+    const messageContent = lastMessage.querySelector('.message-content');
+
+    if (!messageContent) {
+        showToast('No content to copy', 'warning');
+        return;
+    }
+
+    try {
+        // Get the text content, preserving some formatting
+        const text = messageContent.innerText || messageContent.textContent;
+        await navigator.clipboard.writeText(text);
+        showToast('Response copied to clipboard', 'success');
+    } catch (error) {
+        // Fallback for older browsers
+        const textarea = document.createElement('textarea');
+        textarea.value = messageContent.innerText || messageContent.textContent;
+        document.body.appendChild(textarea);
+        textarea.select();
+        document.execCommand('copy');
+        document.body.removeChild(textarea);
+        showToast('Response copied to clipboard', 'success');
+    }
+}
+
+// Show delete files modal
+async function showDeleteFilesModal() {
+    try {
+        // Load attached files
+        const response = await fetch(`/api/chat/${conversationId}/command/info`, {
+            method: 'POST'
+        });
+        const data = await response.json();
+        const files = data.data.attached_files || [];
+
+        if (files.length === 0) {
+            showToast('No files attached to this conversation', 'info');
+            return;
+        }
+
+        let filesHTML = '';
+        files.forEach(file => {
+            filesHTML += `
+                <div class="form-check">
+                    <input class="form-check-input file-delete-checkbox" type="checkbox" value="${file.id}" id="file-${file.id}">
+                    <label class="form-check-label" for="file-${file.id}">
+                        <i class="bi bi-file-earmark"></i> ${escapeHtml(file.filename)}
+                        <span class="text-muted small">(${(file.size_bytes / 1024).toFixed(2)} KB)</span>
+                    </label>
+                </div>
+            `;
+        });
+
+        const modalHTML = `
+            <div class="modal fade" id="deleteFilesModal" tabindex="-1">
+                <div class="modal-dialog">
+                    <div class="modal-content">
+                        <div class="modal-header">
+                            <h5 class="modal-title"><i class="bi bi-file-earmark-x text-warning"></i> Delete Attached Files</h5>
+                            <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
+                        </div>
+                        <div class="modal-body">
+                            <p>Select files to delete:</p>
+                            <div class="mb-3">
+                                <button class="btn btn-sm btn-outline-secondary me-2" onclick="toggleAllDeleteFiles(true)">Select All</button>
+                                <button class="btn btn-sm btn-outline-secondary" onclick="toggleAllDeleteFiles(false)">Deselect All</button>
+                            </div>
+                            <div id="delete-files-list">
+                                ${filesHTML}
+                            </div>
+                        </div>
+                        <div class="modal-footer">
+                            <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
+                            <button type="button" class="btn btn-danger" onclick="performDeleteFiles()">
+                                <i class="bi bi-trash"></i> Delete Selected
+                            </button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        `;
+
+        // Remove old modal if exists
+        const oldModal = document.getElementById('deleteFilesModal');
+        if (oldModal) oldModal.remove();
+
+        document.body.insertAdjacentHTML('beforeend', modalHTML);
+        const modal = new bootstrap.Modal(document.getElementById('deleteFilesModal'));
+        modal.show();
+    } catch (error) {
+        showToast('Failed to load attached files', 'error');
+    }
+}
+
+function toggleAllDeleteFiles(checked) {
+    document.querySelectorAll('.file-delete-checkbox').forEach(cb => cb.checked = checked);
+}
+
+async function performDeleteFiles() {
+    const checkboxes = document.querySelectorAll('.file-delete-checkbox:checked');
+    const fileIds = Array.from(checkboxes).map(cb => cb.value);
+
+    if (fileIds.length === 0) {
+        showToast('Please select at least one file to delete', 'warning');
+        return;
+    }
+
+    if (!confirm(`Are you sure you want to delete ${fileIds.length} file(s)?`)) return;
+
+    try {
+        const response = await fetch(`/api/chat/${conversationId}/command/deletefiles`, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            body: JSON.stringify({ file_ids: fileIds.map(id => parseInt(id)) })
+        });
+
+        const data = await response.json();
+
+        if (data.status === 'success') {
+            bootstrap.Modal.getInstance(document.getElementById('deleteFilesModal')).hide();
+            showToast(`Deleted ${data.data.deleted_count} file(s)`, 'success');
+        } else {
+            showToast(data.message || 'Failed to delete files', 'error');
+        }
+    } catch (error) {
+        showToast('Failed to delete files', 'error');
+    }
+}
+
+// Confirm and delete conversation
+async function confirmDeleteConversation() {
+    if (!confirm('Are you sure you want to delete this conversation? This cannot be undone.')) return;
+
+    try {
+        const response = await fetch(`/api/conversations/${conversationId}`, {
+            method: 'DELETE'
+        });
+
+        const data = await response.json();
+
+        if (data.status === 'success') {
+            showToast('Conversation deleted', 'success');
+            // Redirect to main menu after a short delay
+            setTimeout(() => {
+                window.location.href = '/';
+            }, 1000);
+        } else {
+            showToast(data.message || 'Failed to delete conversation', 'error');
+        }
+    } catch (error) {
+        showToast('Failed to delete conversation', 'error');
+    }
+}
 </script>
 {% endblock %}

dtSpark/web/templates/main_menu.html

@@ -795,39 +795,81 @@ async function selectToolSource(source, event) {
     const contentEl = document.getElementById('tool-details-content');
 
     if (source === 'embedded') {
-        // Show embedded tools
+        // Show embedded tools - fetch dynamically from API
         headerEl.innerHTML = '<i class="bi bi-box-fill"></i> Embedded Tools';
         contentEl.innerHTML = `
-            <div class="list-group list-group-flush">
-                <div class="list-group-item bg-transparent border-secondary">
-                    <div class="d-flex justify-content-between align-items-start">
-                        <div>
-                            <strong>execute_mcp_tool</strong>
-                            <p class="text-muted small mb-0 mt-1">Execute a tool provided by an MCP server</p>
-                        </div>
-                        <span class="badge bg-info">Core</span>
-                    </div>
-                </div>
-                <div class="list-group-item bg-transparent border-secondary">
-                    <div class="d-flex justify-content-between align-items-start">
-                        <div>
-                            <strong>conversation_search</strong>
-                            <p class="text-muted small mb-0 mt-1">Search through conversation history</p>
-                        </div>
-                        <span class="badge bg-info">Core</span>
-                    </div>
-                </div>
-                <div class="list-group-item bg-transparent border-secondary">
-                    <div class="d-flex justify-content-between align-items-start">
-                        <div>
-                            <strong>file_attachment</strong>
-                            <p class="text-muted small mb-0 mt-1">Attach files to the conversation context</p>
-                        </div>
-                        <span class="badge bg-info">Core</span>
-                    </div>
-                </div>
+            <div class="text-center py-4">
+                <div class="spinner-border spinner-border-sm text-primary" role="status"></div>
+                <span class="ms-2">Loading embedded tools...</span>
             </div>
         `;
+
+        try {
+            const response = await fetch('/api/embedded-tools');
+            const tools = await response.json();
+
+            if (tools.length === 0) {
+                contentEl.innerHTML = `
+                    <div class="text-center py-4 text-muted">
+                        <i class="bi bi-inbox fs-2 d-block mb-2"></i>
+                        <p class="mb-0">No embedded tools enabled</p>
+                    </div>
+                `;
+                return;
+            }
+
+            // Group tools by category
+            const categories = {};
+            tools.forEach(tool => {
+                const cat = tool.category || 'Core';
+                if (!categories[cat]) categories[cat] = [];
+                categories[cat].push(tool);
+            });
+
+            // Define category badge colours
+            const categoryBadges = {
+                'Core': 'bg-info',
+                'Filesystem': 'bg-success',
+                'Documents': 'bg-primary',
+                'Archives': 'bg-warning text-dark'
+            };
+
+            // Render tools grouped by category
+            let html = '<div class="list-group list-group-flush">';
+
+            // Order categories: Core, Filesystem, Documents, Archives
+            const categoryOrder = ['Core', 'Filesystem', 'Documents', 'Archives'];
+            categoryOrder.forEach(category => {
+                if (categories[category]) {
+                    categories[category].forEach(tool => {
+                        const badgeClass = categoryBadges[category] || 'bg-secondary';
+                        html += `
+                            <div class="list-group-item bg-transparent border-secondary">
+                                <div class="d-flex justify-content-between align-items-start">
+                                    <div>
+                                        <strong>${tool.name}</strong>
+                                        <p class="text-muted small mb-0 mt-1">${tool.description}</p>
+                                    </div>
+                                    <span class="badge ${badgeClass}">${category}</span>
+                                </div>
+                            </div>
+                        `;
+                    });
+                }
+            });
+
+            html += '</div>';
+            contentEl.innerHTML = html;
+
+        } catch (error) {
+            console.error('Error loading embedded tools:', error);
+            contentEl.innerHTML = `
+                <div class="alert alert-danger">
+                    <i class="bi bi-exclamation-triangle-fill"></i>
+                    Failed to load embedded tools: ${error.message}
+                </div>
+            `;
+        }
     } else if (source.startsWith('mcp:')) {
         // Show MCP server tools
         const serverName = source.substring(4);