updated view and database

app/services/file_service.py

@@ -9,13 +9,14 @@ from pathlib import Path
 from werkzeug.utils import secure_filename
 from app.models import Device, FileUpload
 from config.database_config import get_db
+from sqlalchemy import func
 import logging
 
 class FileUploadService:
     """Service for handling file uploads and processing"""
     
     def __init__(self):
-        self.db = get_db()
+        self._db = None
         self.upload_folder = Path("data/uploads")
         self.upload_folder.mkdir(exist_ok=True)
         
@@ -27,7 +28,14 @@ class FileUploadService:
         
         # Max file size (50MB)
         self.max_file_size = 50 * 1024 * 1024
-    
+
+    @property
+    def db(self):
+        """Lazily resolve the database handle (see LogCompressionService.db)."""
+        if self._db is None:
+            self._db = get_db()
+        return self._db
+
     def process_uploaded_file(self, file, device_info):
         """Process uploaded file from device"""
         try:
@@ -105,7 +113,7 @@ class FileUploadService:
                 
                 # Process file content if it's a log file
                 if self._is_log_file(filename, mime_type):
-                    self._process_log_file(file_upload, file_content)
+                    self._process_log_file(session, file_upload, file_content)
                 
                 return {
                     'success': True,
@@ -176,51 +184,50 @@ class FileUploadService:
         
         return False
     
-    def _process_log_file(self, file_upload, content):
-        """Process log file content to extract log entries"""
+    def _process_log_file(self, session, file_upload, content):
+        """Process log file content to extract log entries.
+
+        Reuses the caller's database session (no nested per-line sessions) by
+        calling LogCompressionService.store_log_in_session for every line.
+        """
         try:
             # Mark as log file
             file_upload.is_log_file = True
-            
+
             # Simple log processing - split by lines
             lines = content.decode('utf-8', errors='ignore').split('\n')
             entries_extracted = 0
-            
+
             from app.services.log_service import LogCompressionService
             log_service = LogCompressionService()
-            
-            device_info = {
-                'hostname': file_upload.device.hostname,
-                'device_ip': file_upload.device.device_ip,
-                'nume_masa': file_upload.device.nume_masa
-            }
-            
+
+            device = file_upload.device
+
             for line_num, line in enumerate(lines, 1):
                 line = line.strip()
                 if not line:
                     continue
-                
+
                 # Try to extract timestamp and message
                 # This is a simple implementation - enhance as needed
                 message = f"[File: {file_upload.original_filename}:{line_num}] {line}"
-                
-                # Process through log compression service
-                result = log_service.process_log_message(
-                    device_info=device_info,
+
+                # Store within the SAME session – avoids opening a session per line
+                log_service.store_log_in_session(
+                    session=session,
+                    device=device,
                     message=message,
                     severity='info'
                 )
-                
-                if result['success']:
-                    entries_extracted += 1
-            
+                entries_extracted += 1
+
             # Update file record
             file_upload.log_entries_extracted = entries_extracted
             file_upload.processed = True
             file_upload.processing_status = 'completed'
-            
+
             logging.info(f"Processed log file {file_upload.filename}: {entries_extracted} entries extracted")
-            
+
         except Exception as e:
             logging.error(f"Error processing log file content: {e}")
             file_upload.processing_status = 'error'
@@ -235,7 +242,7 @@ class FileUploadService:
                 
                 # Calculate total size
                 total_size = session.query(
-                    session.func.sum(FileUpload.file_size)
+                    func.sum(FileUpload.file_size)
                 ).scalar() or 0
                 
                 # Count by processing status