diff --git a/data_analyzer/processor.py b/data_analyzer/processor.py index cfb59b8..5260c05 100644 --- a/data_analyzer/processor.py +++ b/data_analyzer/processor.py @@ -14,6 +14,21 @@ class DataAnalysisAgentProcessor(StandardWebhookProcessor): webhook_url = settings.N8N_WEBHOOK_DATA_ANALYZER agent_id = 'data-analysis-001' + def _extract_text_from_sections(self, sections): + """Extract plain text from structured sections for legacy compatibility""" + text_parts = [] + + for section in sections: + heading = section.get('heading', '') + content = section.get('content', '') + + if heading and content: + text_parts.append(f"### {heading}") + text_parts.append(content) + text_parts.append("") # Add empty line between sections + + return "\n".join(text_parts).strip() + def make_request(self, data, timeout=60): """Override to send PDF file as binary data instead of JSON""" try: @@ -86,10 +101,19 @@ class DataAnalysisAgentProcessor(StandardWebhookProcessor): request_obj.status = 'processing' request_obj.save() - # Extract N8N response data based on workflow format - analysis_text = response_data.get('analysis', '') - status = response_data.get('status', 'unknown') - processed_at = response_data.get('processed_at', '') + # Handle new structured format vs legacy format + if 'sections' in response_data: + # New structured format from webhook + analysis_text = self._extract_text_from_sections(response_data['sections']) + status = 'success' # If we got sections, it's successful + processed_at = response_data.get('timestamp', '') + print(f"{self.agent_slug}: Processing new structured format with {len(response_data['sections'])} sections") + else: + # Legacy format + analysis_text = response_data.get('analysis', '') + status = response_data.get('status', 'unknown') + processed_at = response_data.get('processed_at', '') + print(f"{self.agent_slug}: Processing legacy format") # Map N8N response to Django fields analysis_results = { @@ -103,8 +127,10 @@ class DataAnalysisAgentProcessor(StandardWebhookProcessor): report_text = analysis_text raw_response = response_data - # Determine success based on N8N status - success = status == 'success' and bool(analysis_text) + # Determine success based on content + success = bool(analysis_text) and (status == 'success' or 'sections' in response_data) + + print(f"{self.agent_slug}: Success: {success}, Analysis length: {len(analysis_text)}") # Create or update response object (prevent duplicate responses) response_obj, created = DataAnalysisAgentResponse.objects.get_or_create( diff --git a/data_analyzer/templates/data_analyzer/detail.html b/data_analyzer/templates/data_analyzer/detail.html index 36751cc..b489c9a 100644 --- a/data_analyzer/templates/data_analyzer/detail.html +++ b/data_analyzer/templates/data_analyzer/detail.html @@ -5,251 +5,1073 @@ {% block extra_css %} {% endblock %} {% block content %} -
-
- +
+ +
-
-

📊 Data Analyzer

-

Upload your data file and get AI-powered analysis

- -
+

Data Analyzer

+

Upload your data file and get AI-powered analysis with advanced insights

+
+
+
+

Your Wallet

+
đŸ’ŗ
+
+
+
+ {{ user.wallet_balance|floatformat:2 }} AED +
+
Available Balance
+
+
+
+ + + +
+ +
+
+

+ 📤 + Upload & Analyze +

+
+
+ {% csrf_token %} -
- - - Supports: PDF, CSV, Excel files +
+ +
+
📄
+
Click to upload or drag and drop
+
Supports PDF, CSV, Excel files (max 10MB)
+ +
-
- -
-
+
+ +
+
- +
+
-
+
- +
+
-
+
- +
+
+ + +
+ {% if user.is_authenticated %} + {% if user.wallet_balance >= 5.00 %} + + {% else %} +
+ Insufficient balance! You need 5.00 AED. +
+ + đŸ’ŗ Top Up Wallet + + {% endif %} + {% else %} + + 🔐 Login to Continue + + {% endif %} +
- - -
-
âŗ Analyzing your data...
-
Processing file...
-
- - -
-

✅ Analysis Complete

-
-
- - -
-
- - -
-
-

đŸ’ŗ Your Wallet

-
-
- {{ user.wallet_balance|floatformat:2 }} AED -
-
Available Balance
-
- - {% if user.is_authenticated %} - {% if user.wallet_balance >= 5.00 %} - - {% else %} -
- Insufficient balance! You need 5.00 AED. -
- - 💰 Top Up Wallet - - {% endif %} - {% else %} - - 🔑 Login to Continue - - {% endif %} + + +
+
+

+ ℹī¸ + How It Works +

- -
-

💡 How it works

-
    +
    +
    1. Upload your data file
    2. Choose analysis type
    3. Get AI-powered insights
      4. @@ -257,6 +1079,44 @@
+ + + +
+
+

+ âŗ + Processing Status +

+
+
+
âŗ
+
Analyzing your data...
+
Processing file...
+
+
+ + +
+
+

+ 📊 + Analysis Results +

+ Success +
+
+
+
+ + +
+
+
@@ -265,7 +1125,7 @@ let currentResults = ''; // Form submission -document.getElementById('simpleForm').addEventListener('submit', function(e) { +document.getElementById('agentForm').addEventListener('submit', function(e) { e.preventDefault(); // Check if file is selected @@ -277,23 +1137,23 @@ document.getElementById('simpleForm').addEventListener('submit', function(e) { // Check authentication {% if not user.is_authenticated %} - window.location.href = "{% url 'authentication:login' %}"; - return; + window.location.href = "{% url 'authentication:login' %}"; + return; {% endif %} // Check wallet balance const balance = {{ user.wallet_balance|default:0 }}; if (balance < 5.00) { showMessage('Insufficient balance! You need 5.00 AED.', 'error'); - setTimeout(() => { + setTimeout(function() { window.location.href = "{% url 'core:wallet' %}"; }, 1500); return; } // Show loading - document.getElementById('loadingDiv').style.display = 'block'; - document.getElementById('resultsDiv').style.display = 'none'; + document.getElementById('processingStatus').style.display = 'block'; + document.getElementById('resultsContainer').style.display = 'none'; document.getElementById('analyzeBtn').disabled = true; document.getElementById('analyzeBtn').textContent = 'âŗ Processing...'; @@ -327,50 +1187,293 @@ function checkResults(requestId) { fetch(`/agents/data-analyzer/status/${requestId}/`) .then(response => response.json()) .then(result => { + console.log('Status check result:', result); // Debug log + if (result.status === 'completed') { hideLoading(); if (result.success) { showResults(result); updateWalletBalance(result.wallet_balance); } else { - showError('Analysis failed'); + // Show more detailed error message + const errorMsg = result.error_message || 'Analysis completed but failed to process results'; + console.error('Analysis failed:', errorMsg); + showError(`Analysis failed: ${errorMsg}`); } } else if (result.status === 'failed') { hideLoading(); - showError('Analysis failed'); + const errorMsg = result.error_message || result.message || 'Processing failed'; + console.error('Request failed:', errorMsg); + showError(`Request failed: ${errorMsg}`); } else { // Still processing, check again in 2 seconds + console.log('Still processing, status:', result.status); setTimeout(() => checkResults(requestId), 2000); } }) .catch(error => { console.error('Error checking results:', error); hideLoading(); - showError('Error checking results'); + showError('Network error - please try again'); }); } -// Show results +// Show results - handles new structured format function showResults(result) { - // Get content from different possible fields - let content = result.report_text || result.insights_summary || - (result.raw_response && result.raw_response.analysis) || - 'Analysis completed successfully!'; + let content = ''; + let rawText = ''; - // Simple text formatting (no complex markdown) - content = content.replace(/\*\*/g, '').replace(/\n/g, '
'); + // Check for new structured format from webhook + if (result.raw_response && result.raw_response.sections) { + content = formatStructuredSections(result.raw_response.sections); + rawText = extractRawTextFromSections(result.raw_response.sections); + } + // Legacy formats + else if (result.raw_response && result.raw_response.formatted_html) { + content = result.raw_response.formatted_html; + rawText = result.raw_response.analysis || content; + } + else { + const textContent = result.report_text || result.insights_summary || + (result.raw_response && result.raw_response.analysis) || + 'Analysis completed successfully!'; + content = formatAnalysisResults(textContent); + rawText = textContent; + } - currentResults = content; + currentResults = rawText; // For copy/download functionality document.getElementById('resultsContent').innerHTML = content; - document.getElementById('resultsDiv').style.display = 'block'; + document.getElementById('resultsContainer').style.display = 'block'; // Show success message showMessage('✅ Analysis completed and payment processed!', 'success'); } +// Format new structured sections format +function formatStructuredSections(sections) { + let formattedContent = ''; + + sections.forEach(section => { + const heading = section.heading; + const content = section.content; + + // Add section header + formattedContent += `

${heading}

`; + + // Determine section type and apply appropriate styling + const lowerHeading = heading.toLowerCase(); + let sectionClass = ''; + + if (lowerHeading.includes('summary')) { + sectionClass = 'summary'; + } else if (lowerHeading.includes('key points')) { + sectionClass = 'key-points'; + } else if (lowerHeading.includes('insights')) { + sectionClass = 'insights'; + } + + // Process content + let processedContent = content; + + // Handle numbered lists (1. **Text**: Description) + if (/\d+\.\s\*\*/.test(content)) { + const lines = content.split('\n'); + const listItems = []; + let beforeList = ''; + + lines.forEach(line => { + line = line.trim(); + if (/^\d+\.\s\*\*/.test(line)) { + const cleanItem = line.replace(/^\d+\.\s/, ''); + listItems.push(cleanItem); + } else if (line && listItems.length === 0) { + beforeList += line + ' '; + } + }); + + processedContent = ''; + if (beforeList.trim()) { + processedContent += `

${beforeList.trim()}

`; + } + + if (listItems.length > 0) { + processedContent += '
    '; + listItems.forEach(item => { + processedContent += `
  1. ${item}
    2. `; + }); + processedContent += '
'; + } + } + // Handle bullet lists (- Text) + else if (/^-\s/.test(content.trim()) || content.includes('\n- ')) { + const lines = content.split('\n'); + const listItems = []; + let beforeList = ''; + + lines.forEach(line => { + line = line.trim(); + if (line.startsWith('- ')) { + const cleanItem = line.replace(/^- /, ''); + listItems.push(cleanItem); + } else if (line && listItems.length === 0) { + beforeList += line + ' '; + } + }); + + processedContent = ''; + if (beforeList.trim()) { + processedContent += `

${beforeList.trim()}

`; + } + + if (listItems.length > 0) { + processedContent += '
    '; + listItems.forEach(item => { + processedContent += `
  • ${item}
    • `; + }); + processedContent += '
'; + } + } + // Regular paragraph content + else { + processedContent = `

${content.replace(/\n/g, '
')}

`; + } + + // Apply section styling + if (sectionClass) { + formattedContent += `
${processedContent}
`; + } else { + formattedContent += processedContent; + } + }); + + // Enhance strong text and italic + formattedContent = formattedContent.replace(/\*\*(.+?)\*\*/g, '$1'); + formattedContent = formattedContent.replace(/\*(.+?)\*/g, '$1'); + + return formattedContent; +} + +// Extract raw text from structured sections for copy/download +function extractRawTextFromSections(sections) { + let rawText = ''; + + sections.forEach(section => { + rawText += `### ${section.heading}\n`; + rawText += `${section.content}\n\n`; + }); + + return rawText.trim(); +} + +// Enhanced formatting function for analysis results +function formatAnalysisResults(text) { + // Convert markdown-style headers to HTML + text = text.replace(/### (.+)/g, '

$1

'); + text = text.replace(/## (.+)/g, '

$1

'); + text = text.replace(/# (.+)/g, '

$1

'); + + // First, handle numbered lists that are embedded in paragraphs + text = text.replace(/(\d+\.\s[^\.]+\.)\s*/g, '$1\n'); + + // Convert line breaks to proper paragraphs + let paragraphs = text.split('\n\n'); + let formattedContent = ''; + + paragraphs.forEach(paragraph => { + paragraph = paragraph.trim(); + if (paragraph) { + // Check if it's a header + if (paragraph.includes('

') || paragraph.includes('

') || paragraph.includes('

')) { + formattedContent += paragraph; + } + // Check if paragraph contains numbered list items (even if not on separate lines) + else if (/\d+\.\s/.test(paragraph)) { + // Split the paragraph by numbered items + let parts = paragraph.split(/(?=\d+\.\s)/); + let beforeList = parts[0].trim(); + + // Handle any content before the list + if (beforeList && !beforeList.match(/^\d+\./)) { + if (beforeList.toLowerCase().includes('key points')) { + formattedContent += `

${beforeList}

`; + } else if (beforeList.toLowerCase().includes('summary')) { + formattedContent += `

${beforeList}

`; + } else if (beforeList.toLowerCase().includes('insights')) { + formattedContent += `

${beforeList}

`; + } else { + formattedContent += `

${beforeList}

`; + } + } + + // Process the numbered items + let hasNumberedItems = false; + let listItems = []; + + for (let i = 0; i < parts.length; i++) { + let part = parts[i].trim(); + if (part && part.match(/^\d+\./)) { + hasNumberedItems = true; + let cleanItem = part.replace(/^\d+\.\s*/, '').trim(); + listItems.push(cleanItem); + } + } + + if (hasNumberedItems && listItems.length > 0) { + formattedContent += '
    '; + listItems.forEach(item => { + formattedContent += `
  1. ${item}
    2. `; + }); + formattedContent += '
'; + } + + // Close the special div if we opened one + if (beforeList && (beforeList.toLowerCase().includes('key points') || + beforeList.toLowerCase().includes('summary') || + beforeList.toLowerCase().includes('insights'))) { + formattedContent += '
'; + } + } + // Check for bullet lists + else if (paragraph.includes('- ')) { + let listItems = paragraph.split('\n').filter(item => item.trim().startsWith('-')); + if (listItems.length > 0) { + formattedContent += '
    '; + listItems.forEach(item => { + let cleanItem = item.replace(/^- /, '').trim(); + formattedContent += `
  • ${cleanItem}
    • `; + }); + formattedContent += '
'; + } + } + // Regular paragraph + else { + // Convert single line breaks to
+ paragraph = paragraph.replace(/\n/g, '
'); + + // Add special styling for known sections + if (paragraph.toLowerCase().includes('summary')) { + formattedContent += `
${paragraph}
`; + } else if (paragraph.toLowerCase().includes('key points')) { + formattedContent += `
${paragraph}
`; + } else if (paragraph.toLowerCase().includes('insights')) { + formattedContent += `
${paragraph}
`; + } else { + formattedContent += `

${paragraph}

`; + } + } + } + }); + + // Enhance strong text + formattedContent = formattedContent.replace(/\*\*(.+?)\*\*/g, '$1'); + formattedContent = formattedContent.replace(/\*(.+?)\*/g, '$1'); + + return formattedContent; +} + // Helper functions function hideLoading() { - document.getElementById('loadingDiv').style.display = 'none'; + document.getElementById('processingStatus').style.display = 'none'; document.getElementById('analyzeBtn').disabled = false; document.getElementById('analyzeBtn').textContent = '📊 Analyze Data (5.00 AED)'; } @@ -380,32 +1483,83 @@ function showError(message) { showMessage('❌ ' + message, 'error'); } +// Modern Radio Selection +function selectRadio(value) { + // Remove selected class from all cards + document.querySelectorAll('.radio-card').forEach(card => { + card.classList.remove('selected'); + }); + + // Add selected class to clicked card + const selectedCard = document.querySelector(`input[value="${value}"]`).closest('.radio-card'); + selectedCard.classList.add('selected'); + + // Select the radio button + document.getElementById(value).checked = true; +} + +// File Upload Interactions +document.getElementById('dataFile').addEventListener('change', function(e) { + const uploadArea = document.querySelector('.file-upload-area'); + const uploadText = document.querySelector('.upload-text'); + const uploadHint = document.querySelector('.upload-hint'); + + if (e.target.files.length > 0) { + const fileName = e.target.files[0].name; + uploadText.textContent = fileName; + uploadHint.textContent = 'File selected successfully'; + uploadArea.classList.add('active'); + } else { + uploadText.textContent = 'Click to upload or drag and drop'; + uploadHint.textContent = 'Supports PDF, CSV, Excel files (max 10MB)'; + uploadArea.classList.remove('active'); + } +}); + +// Drag and Drop +const uploadArea = document.querySelector('.file-upload-area'); + +uploadArea.addEventListener('dragover', function(e) { + e.preventDefault(); + uploadArea.classList.add('active'); +}); + +uploadArea.addEventListener('dragleave', function(e) { + e.preventDefault(); + uploadArea.classList.remove('active'); +}); + +uploadArea.addEventListener('drop', function(e) { + e.preventDefault(); + uploadArea.classList.remove('active'); + + const files = e.dataTransfer.files; + if (files.length > 0) { + document.getElementById('dataFile').files = files; + // Trigger change event + const event = new Event('change', { bubbles: true }); + document.getElementById('dataFile').dispatchEvent(event); + } +}); + +// Initialize radio selection +document.addEventListener('DOMContentLoaded', function() { + selectRadio('summary'); // Set default selection +}); + function showMessage(message, type) { - // Create a toast notification instead of alert popup + // Create modern toast notification const toast = document.createElement('div'); - toast.style.cssText = ` - position: fixed; - top: 20px; - right: 20px; - padding: 16px 24px; - border-radius: 8px; - color: white; - font-weight: 600; - font-size: 14px; - z-index: 10000; - max-width: 400px; - box-shadow: 0 4px 12px rgba(0,0,0,0.3); - ${type === 'success' ? 'background: #10b981;' : 'background: #ef4444;'} - `; + toast.className = `toast ${type}`; toast.textContent = message; document.body.appendChild(toast); - // Remove toast after 3 seconds + // Remove toast after 4 seconds setTimeout(() => { if (toast.parentNode) { toast.remove(); } - }, 3000); + }, 4000); } function updateWalletBalance(newBalance) { @@ -434,5 +1588,19 @@ function downloadResults() { showMessage('💾 Results downloaded!', 'success'); } } + + +// Initialize agent +document.addEventListener('DOMContentLoaded', function() { + selectRadio('summary'); // Set default selection + + // Initialize agent widgets + initializeAgent(); +}); + +function initializeAgent() { + // Any agent-specific initialization can go here + console.log('Agent initialized'); +} {% endblock %} \ No newline at end of file diff --git a/data_analyzer/views.py b/data_analyzer/views.py index 6fdd65e..2d563f3 100644 --- a/data_analyzer/views.py +++ b/data_analyzer/views.py @@ -70,14 +70,25 @@ def data_analyzer_detail(request): except Exception as e: return JsonResponse({'error': str(e)}, status=500) + # Handle non-AJAX POST requests (redirect to prevent resubmission popup) + elif request.method == 'POST': + messages.info(request, 'Please use the analyze button to process your data.') + return redirect('data_analyzer:detail') + # Regular GET request - show the form page user_requests = DataAnalysisAgentRequest.objects.filter( user=request.user ).select_related('agent').prefetch_related('response').order_by('-created_at')[:10] + # Get other available agents for quick access + available_agents = BaseAgent.objects.filter( + is_active=True + ).exclude(slug='data-analyzer').order_by('name') + context = { 'agent': agent, - 'user_requests': user_requests + 'user_requests': user_requests, + 'available_agents': available_agents } return render(request, 'data_analyzer/detail.html', context)