chore: Merge Dev to Main

.github/workflows/build-docker-images.yml

@@ -7,6 +7,16 @@ on:
       - dev
       - demo
       - hotfix
+    paths:
+      - 'src/backend/**'
+      - 'src/frontend/**'
+      - 'docker/**'
+      - '.github/workflows/build-docker-images.yml'
+      - '.github/workflows/build-docker.yml'
+      - 'infra/**'
+      - 'scripts/**'
+      - 'azure.yaml'
+      - '.github/workflows/deploy.yml'
   pull_request:
     branches:
       - main
@@ -18,6 +28,16 @@ on:
       - ready_for_review
       - reopened
       - synchronize
+    paths:
+      - 'src/backend/**'
+      - 'src/frontend/**'
+      - 'docker/**'
+      - '.github/workflows/build-docker-images.yml'
+      - '.github/workflows/build-docker.yml'
+      - 'infra/**'
+      - 'scripts/**'
+      - 'azure.yaml'
+      - '.github/workflows/deploy.yml'
   merge_group:
   workflow_dispatch:
 

.github/workflows/deploy.yml

@@ -438,4 +438,4 @@ jobs:
         if: always()
         run: |
           az logout
-          echo "Logged out from Azure."
+          echo "Logged out from Azure."

.github/workflows/pylint.yml

@@ -1,6 +1,13 @@
 name: PyLint
 
-on: [push]
+on:
+  push:
+    paths:
+      - '**/*.py'
+      - '**/requirements.txt'
+      - '**/pyproject.toml'
+      - '.flake8'
+      - '.github/workflows/pylint.yml'
 
 jobs:
   lint:

.github/workflows/test.yml

@@ -6,6 +6,13 @@ on:
       - main
       - dev
       - demo
+    paths:
+      - 'src/backend/**/*.py'
+      - 'src/tests/backend/**'
+      - '.github/workflows/test.yml'
+      - 'src/backend/requirements.txt'
+      - 'src/frontend/requirements.txt'
+      - 'src/backend/pyproject.toml'
   pull_request:
     types:
       - opened
@@ -16,6 +23,13 @@ on:
       - main
       - dev
       - demo
+    paths:
+      - 'src/backend/**/*.py'
+      - 'src/tests/backend/**'
+      - '.github/workflows/test.yml'
+      - 'src/backend/requirements.txt'
+      - 'src/frontend/requirements.txt'
+      - 'src/backend/pyproject.toml'
 
 jobs:
 #   frontend_tests:

src/backend/api/api_routes.py

@@ -279,6 +279,7 @@ async def batch_status_updates(
             try:
                 await websocket.receive_text()
             except asyncio.TimeoutError:
+                # TimeoutError is ignored to keep the WebSocket connection open without receiving data
                 pass
 
     except WebSocketDisconnect:

src/backend/common/database/cosmosdb.py

@@ -352,10 +352,6 @@ async def update_batch_entry(
             batch["file_count"] = file_count
 
             await self.batch_container.replace_item(item=batch_id, body=batch)
-            # if isinstance(status, ProcessStatus):
-            #     self.logger.info(f"Updated batch {batch_id} to status {status.value}")
-            # else:
-            #     self.logger.info(f"Updated batch {batch_id} to status {status}")
 
             return batch
         except Exception as e:

src/backend/common/services/batch_service.py

@@ -175,6 +175,8 @@ async def delete_batch(self, batch_id: UUID, user_id: str):
 
             self.logger.info(f"Successfully deleted batch with ID: {batch_id}")
             return {"message": "Batch deleted successfully", "batch_id": str(batch_id)}
+        else:
+            return {"message": "Batch not found", "batch_id": str(batch_id)}
 
     async def delete_file(self, file_id: UUID, user_id: str):
         """Delete a file and its logs, and update batch file count."""

src/backend/common/storage/blob_azure.py

@@ -52,7 +52,7 @@ async def upload_file(
             raise
         try:
             # Upload the file
-            upload_results = blob_client.upload_blob(  # noqa: F841
+            blob_client.upload_blob(
                 file_content,
                 content_type=content_type,
                 metadata=metadata,

src/backend/sql_agents/helpers/comms_manager.py

@@ -270,17 +270,3 @@ async def cleanup(self):
 
         except Exception as e:
             self.logger.error("Error during cleanup: %s", str(e))
-
-    def __del__(self):
-        """Destructor to ensure cleanup if not explicitly called."""
-        try:
-            # Only attempt cleanup if there's an active event loop
-            loop = asyncio.get_running_loop()
-            if loop and not loop.is_closed():
-                # Schedule cleanup as a task
-                loop.create_task(self.cleanup())
-        except RuntimeError:
-            # No event loop running, can't clean up asynchronously
-            self.logger.warning("No event loop available for cleanup in destructor")
-        except Exception as e:
-            self.logger.error("Error in destructor cleanup: %s", str(e))

src/backend/sql_agents/tools/src/Program.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using Microsoft.SqlServer.TransactSql.ScriptDom;
 using Newtonsoft.Json;
 
@@ -42,18 +43,14 @@ static void Main(string[] args)
 
             IList<ParseError> errors = ParseSqlQuery(sqlQuery);
 
-            var errorList = new List<Dictionary<string, object>>();
-
-            foreach (var error in errors)
-            {
-                var errorDict = new Dictionary<string, object>
+            var errorList = errors
+                .Select(error => new Dictionary<string, object>
                 {
                     { "Line", error.Line },
                     { "Column", error.Column },
                     { "Error", error.Message }
-                };
-                errorList.Add(errorDict);
-            }
+                })
+                .ToList();
 
             string jsonOutput = JsonConvert.SerializeObject(errorList, Formatting.Indented);
             Console.WriteLine(jsonOutput);

src/frontend/frontend_server.py

@@ -4,7 +4,7 @@
 from dotenv import load_dotenv
 from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
-from fastapi.responses import FileResponse, HTMLResponse
+from fastapi.responses import FileResponse
 from fastapi.staticfiles import StaticFiles
 
 # Load environment variables from .env file

src/frontend/src/api/utils.tsx

@@ -414,7 +414,7 @@ export const renderErrorSection = (batchSummary, expandedSections, setExpandedSe
 
 export const renderErrorContent = (batchSummary) => {
   // Group errors by file
-  const errorFiles = batchSummary.files.filter(file => file.error_count && file.error_count);
+  const errorFiles = batchSummary.files.filter(file => file.error_count);
   if (errorFiles.length === 0) {
     return (
       <div className={useStyles().errorItem}>

src/frontend/src/components/batchHistoryPanel.tsx

@@ -1,6 +1,6 @@
 import React, { useState, useEffect, useRef } from "react";
 
-import { useDispatch, useSelector } from 'react-redux';
+import { useDispatch } from 'react-redux';
 import { Card, Spinner, Tooltip } from "@fluentui/react-components";
 import { useNavigate } from "react-router-dom";
 import ConfirmationDialog from "../commonComponents/ConfirmationDialog/confirmationDialogue";
@@ -21,7 +21,7 @@ interface BatchHistoryItem {
   status: string;
 }
 const HistoryPanel: React.FC<HistoryPanelProps> = ({ isOpen, onClose }) => {
-  const headers = {}
+  const headers = {};
   const [batchHistory, setBatchHistory] = useState<BatchHistoryItem[]>([]);
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState<string | null>(null);
@@ -81,46 +81,6 @@ const HistoryPanel: React.FC<HistoryPanelProps> = ({ isOpen, onClose }) => {
     }
   };
 
-  // Function to categorize batches
-  const categorizeBatches = () => {
-    const now = new Date();
-    const userTimeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;
-
-    // Get start of "Today", "Past 7 days", and "Past 30 days" in LOCAL time
-    const todayStart = new Date(now.getFullYear(), now.getMonth(), now.getDate());
-    const past7DaysStart = new Date(todayStart);
-    const past30DaysStart = new Date(todayStart);
-
-    past7DaysStart.setDate(todayStart.getDate() - 7);
-    past30DaysStart.setDate(todayStart.getDate() - 30);
-
-    const todayBatches: BatchHistoryItem[] = [];
-    const past7DaysBatches: BatchHistoryItem[] = [];
-    const past30DaysBatches: BatchHistoryItem[] = [];
-
-    batchHistory.forEach(batch => {
-      // Convert UTC timestamp to user's local date
-      const updatedAtUTC = new Date(batch.created_at);
-      const updatedAtLocal = new Date(updatedAtUTC.toLocaleString("en-US", { timeZone: userTimeZone }));
-
-      // Extract only the local **date** part for comparison
-      const updatedDate = new Date(updatedAtLocal.getFullYear(), updatedAtLocal.getMonth(), updatedAtLocal.getDate());
-
-      // Categorize based on **exact day comparison**
-      if (updatedDate.getTime() === todayStart.getTime()) {
-        todayBatches.push(batch);
-      } else if (updatedDate.getTime() >= past7DaysStart.getTime()) {
-        past7DaysBatches.push(batch);
-      } else if (updatedDate.getTime() >= past30DaysStart.getTime()) {
-        past30DaysBatches.push(batch);
-      }
-    });
-
-    return { todayBatches, past7DaysBatches, past30DaysBatches };
-  };
-
-  // const { todayBatches, past7DaysBatches, past30DaysBatches } = categorizeBatches();
-
   const deleteBatchFromHistory = (batchId: string) => {
     // Get the current URL path
     const currentPath = window.location.pathname;

src/frontend/src/components/bottomBar.tsx

@@ -1,6 +1,5 @@
 import { Button, Card, Dropdown, DropdownProps, Option } from "@fluentui/react-components"
-import React, { useState } from "react"
-import { useNavigate } from "react-router-dom"
+import React from "react"
 
 // Define possible upload states
 const UploadState = {

src/frontend/src/components/uploadButton.tsx

@@ -68,7 +68,6 @@ const FileUploadZone: React.FC<FileUploadZoneProps> = ({
   const [uploadIntervals, setUploadIntervals] = useState<{ [key: string]: ReturnType<typeof setTimeout> }>({});
   const [showCancelDialog, setShowCancelDialog] = useState(false);
   const [showLogoCancelDialog, setShowLogoCancelDialog] = useState(false);
-  const [uploadState, setUploadState] = useState<'IDLE' | 'UPLOADING' | 'COMPLETED'>('IDLE');
   const [batchId, setBatchId] = useState<string>(uuidv4());
   const [allUploadsComplete, setAllUploadsComplete] = useState(false);
   const [fileLimitExceeded, setFileLimitExceeded] = useState(false);
@@ -98,7 +97,6 @@ const FileUploadZone: React.FC<FileUploadZoneProps> = ({
       }
     }
 
-    setUploadState(newState);
     onUploadStateChange?.(newState);
   }, [uploadingFiles, onUploadStateChange]);
 

src/frontend/src/main.jsx

@@ -50,7 +50,7 @@ const Main = () => {
     const baseURL = config.API_URL.replace(/\/api$/, ''); // Remove '/api' if it appears at the end
     console.log('Checking connection to:', baseURL);
     try {
-      const response = await fetch(`${baseURL}/health`);
+      await fetch(`${baseURL}/health`);
     } catch (error) {
       console.error('Error connecting to backend:', error);
     }

src/frontend/src/pages/batchView.tsx

@@ -33,7 +33,7 @@ import PanelRight from "../components/Panels/PanelRight";
 import PanelRightToolbar from "../components/Panels/PanelRightToolbar";
 import BatchHistoryPanel from "../components/batchHistoryPanel";
 import ConfirmationDialog from "../commonComponents/ConfirmationDialog/confirmationDialogue";
-import { determineFileStatus, filesLogsBuilder, renderErrorSection, useStyles, renderFileError, filesErrorCounter, completedFiles, hasFiles, fileErrorCounter, BatchSummary, fileWarningCounter } from "../api/utils";
+import { determineFileStatus, filesLogsBuilder, renderErrorSection, useStyles, renderFileError, filesErrorCounter, completedFiles, hasFiles, fileErrorCounter, BatchSummary } from "../api/utils";
 export const History = bundleIcon(HistoryFilled, HistoryRegular);
 import { format } from "sql-formatter";
 
@@ -73,7 +73,6 @@ const BatchStoryPage = () => {
   const [selectedFileId, setSelectedFileId] = useState<string>("");
   const [expandedSections, setExpandedSections] = useState(["errors"]);
   const [batchSummary, setBatchSummary] = useState<BatchSummary | null>(null);
-  const [selectedFileContent, setSelectedFileContent] = useState<string>("");
   const [selectedFileTranslatedContent, setSelectedFileTranslatedContent] = useState<string>("");
 
 
@@ -209,40 +208,6 @@ const BatchStoryPage = () => {
     fetchFileContent();
   }, [selectedFileId]);
 
-
-  const renderWarningContent = () => {
-    if (!expandedSections.includes("warnings")) return null;
-
-    if (!batchSummary) return null;
-
-    // Group warnings by file
-    const warningFiles = files.filter(file => file.warningCount && file.warningCount > 0 && file.id !== "summary");
-
-    if (warningFiles.length === 0) {
-      return (
-        <div className={styles.errorItem}>
-          <Text>No warnings found.</Text>
-        </div>
-      );
-    }
-
-    return (
-      <div>
-        {warningFiles.map((file, fileIndex) => (
-          <div key={fileIndex} className={styles.errorItem}>
-            <div className={styles.errorTitle}>
-              <Text weight="semibold">{file.name} ({file.warningCount})</Text>
-              <Text className={styles.errorSource}>source</Text>
-            </div>
-            <div className={styles.errorDetails}>
-              <Text>Warning in file processing. See file for details.</Text>
-            </div>
-          </div>
-        ))}
-      </div>
-    );
-  };
-
   const renderContent = () => {
     // Define header content based on selected file
     const renderHeader = () => {
@@ -385,7 +350,7 @@ const BatchStoryPage = () => {
     }
 
     // Show the summary page when summary is selected
-    if (selectedFile.id === "summary" && batchSummary) {
+    if (selectedFile.id === "summary") {
       // Check if there are no errors and all files are processed successfully
       const noErrors = (batchSummary.error_count === 0);
       const allFilesProcessed = (batchSummary.completed_files === batchSummary.total_files);

src/frontend/src/pages/landingPage.tsx

@@ -33,7 +33,6 @@ export const LandingPage = (): JSX.Element => {
   const dispatch = useDispatch(); // Add dispatch hook
   const [selectedTargetLanguage, setSelectedTargetLanguage] = useState<string[]>(["T-SQL"]);
   const [selectedCurrentLanguage, setSelectedCurrentLanguage] = useState<string[]>(["Informix"]);
-  const batchHistoryRef = useRef<{ triggerDeleteAll: () => void } | null>(null);
   const isPanelOpen = useSelector((state: RootState) => state.historyPanel.isOpen);
   const navigate = useNavigate();