Merge pull request #308 from microsoft/dev

chore: Merge Dev to Main

Author: Prajwal-Microsoft

.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);