fix: Merge Dev to Main

Avijit-Microsoft · web-flow · commit dd023f199e2f · 2025-12-29T12:50:25.000+05:30
diff --git a/.github/workflows/build-docker-image.yml b/.github/workflows/build-docker-image.yml
@@ -3,9 +3,46 @@ name: Build and Push Docker Images
 on:
   push:
     branches: [main, dev, demo, hotfix]
+    paths:
+      - 'src/ContentProcessor/src/**'
+      - 'src/**/Dockerfile'
+      - 'src/**/requirements.txt'
+      - 'src/**/pyproject.toml'
+      - 'src/ContentProcessorAPI/app/**'
+      - 'src/ContentProcessorAPI/helpers/**'
+      - 'src/ContentProcessorWeb/src/**'
+      - 'src/ContentProcessorWeb/public/**'
+      - 'src/ContentProcessorWeb/package.json'
+      - 'src/ContentProcessorWeb/package-lock.json'
+      - 'src/ContentProcessorWeb/yarn.lock'
+      - 'src/ContentProcessorWeb/tsconfig.json'
+      - 'src/ContentProcessorWeb/config-overrides.js'
+      - 'src/ContentProcessorWeb/nginx-custom.conf'
+      - 'src/ContentProcessorWeb/env.sh'
+      - '.github/workflows/build-docker-image.yml'
   pull_request:
     branches: [main, dev, demo, hotfix]
     types: [opened, ready_for_review, reopened, synchronize]
+    paths:
+      - 'src/ContentProcessor/src/**'
+      - 'src/**/Dockerfile'
+      - 'src/**/requirements.txt'
+      - 'src/**/pyproject.toml'
+      - 'src/ContentProcessorAPI/app/**'
+      - 'src/ContentProcessorAPI/helpers/**'
+      - 'src/ContentProcessorWeb/src/**'
+      - 'src/ContentProcessorWeb/public/**'
+      - 'src/ContentProcessorWeb/package.json'
+      - 'src/ContentProcessorWeb/package-lock.json'
+      - 'src/ContentProcessorWeb/yarn.lock'
+      - 'src/ContentProcessorWeb/tsconfig.json'
+      - 'src/ContentProcessorWeb/config-overrides.js'
+      - 'src/ContentProcessorWeb/nginx-custom.conf'
+      - 'src/ContentProcessorWeb/env.sh'
+      - 'infra/**/*.bicep'
+      - 'infra/**/*.json'
+      - 'azure.yaml'
+      - '.github/workflows/build-docker-image.yml'
   workflow_dispatch:
 
 jobs:
diff --git a/.github/workflows/deploy-linux.yml b/.github/workflows/deploy-linux.yml
@@ -3,6 +3,23 @@ on:
   push:
     branches:
       - main
+    paths:
+      - 'src/ContentProcessor/src/**'
+      - 'src/**/Dockerfile'
+      - 'src/**/requirements.txt' 
+      - 'src/**/pyproject.toml'
+      - 'src/ContentProcessorAPI/app/**'
+      - 'src/ContentProcessorAPI/helpers/**'
+      - 'src/ContentProcessorWeb/src/**'
+      - 'src/ContentProcessorWeb/public/**'
+      - 'src/ContentProcessorWeb/package.json'
+      - 'src/ContentProcessorWeb/package-lock.json'
+      - 'src/ContentProcessorWeb/yarn.lock'
+      - 'src/ContentProcessorWeb/tsconfig.json'
+      - 'src/ContentProcessorWeb/config-overrides.js'
+      - 'src/ContentProcessorWeb/nginx-custom.conf'
+      - 'src/ContentProcessorWeb/env.sh'
+      - '.github/workflows/deploy-linux.yml'
   workflow_dispatch:
     inputs:
       azure_location:
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -4,6 +4,13 @@ on:
   push:
     branches:
       - main
+    paths:
+      - 'infra/**'
+      - 'src/**'
+      - 'tests/e2e-test/**'
+      - 'azure.yaml'
+      - '.github/workflows/deploy.yml'
+      - '.github/workflows/test-automation.yml'
   schedule:
     - cron: "0 9,21 * * *" # Runs at 9:00 AM and 9:00 PM GMT
   workflow_dispatch:
diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml
@@ -1,6 +1,14 @@
 name: PyLint
 
-on: [push]
+on: 
+  push:
+    paths:
+      - 'src/**/*.py'
+      - 'tests/**/*.py'
+      - '.flake8'
+      - 'src/**/requirements.txt'
+      - 'src/**/pyproject.toml'
+      - '.github/workflows/pylint.yml'
 
 jobs:
   build:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -6,6 +6,14 @@ on:
       - main
       - dev
       - demo
+    paths:
+      - 'src/**/*.py'
+      - 'tests/**/*.py'
+      - 'src/**/requirements.txt'
+      - 'src/**/pyproject.toml'
+      - 'src/**/pytest.ini'
+      - 'src/**/conftest.py'
+      - '.github/workflows/test.yml'
   pull_request:
     types:
       - opened
@@ -16,6 +24,14 @@ on:
       - main
       - dev
       - demo
+    paths:
+      - 'src/**/*.py'
+      - 'tests/**/*.py'
+      - 'src/**/requirements.txt'
+      - 'src/**/pyproject.toml'
+      - 'src/**/pytest.ini'
+      - 'src/**/conftest.py'
+      - '.github/workflows/test.yml'
 
 jobs:
   backend_tests:
diff --git a/docs/DeploymentGuide.md b/docs/DeploymentGuide.md
@@ -132,7 +132,7 @@ You can run this solution in [VS Code Dev Containers](https://code.visualstudio.
 </details>
 
 <details>
-  <summary><b>Option 3:Deploy in Visual Studio Code (WEB)</b></summary>
+  <summary><b>Option 3: Deploy in Visual Studio Code (WEB)</b></summary>
 
 ### Visual Studio Code (WEB)
 
@@ -313,7 +313,7 @@ When creating your environment name, follow these rules:
 - **No special characters** (-, _, spaces, etc.)
 - **Examples:** `cpsapp01`, `mycontentapp`, `devtest123`
 
-> **💡 Tip:** Use a descriptive prefix + environment + suffix to form a a unique string
+> **💡 Tip:** Use a descriptive prefix + environment + suffix to form a unique string
 
 #### Deployment Steps
 
diff --git a/src/ContentProcessor/src/libs/azure_helper/model/content_understanding.py b/src/ContentProcessor/src/libs/azure_helper/model/content_understanding.py
@@ -19,6 +19,7 @@ class Word(BaseModel):
     polygon: Optional[List[float]] = None
 
     @field_validator("polygon", mode="after")
+    @classmethod
     def parse_polygon(cls, value, info: ValidationInfo):
         """
         Providing comparability with Azure Documenent Document Intelligence Service API result.
@@ -51,6 +52,7 @@ class Line(BaseModel):
     polygon: Optional[List[float]] = None
 
     @field_validator("polygon", mode="after")
+    @classmethod
     def parse_polygon(cls, value, info: ValidationInfo):
         source_str = info.data.get("source", "")
         if source_str.startswith("D(") and source_str.endswith(")"):
@@ -73,6 +75,7 @@ class Paragraph(BaseModel):
     polygon: Optional[List[float]] = None
 
     @field_validator("polygon", mode="after")
+    @classmethod
     def parse_polygon(cls, value, info: ValidationInfo):
         source_str = info.data.get("source", "")
         if source_str.startswith("D(") and source_str.endswith(")"):
diff --git a/src/ContentProcessor/src/libs/pipeline/entities/pipeline_file.py b/src/ContentProcessor/src/libs/pipeline/entities/pipeline_file.py
@@ -81,7 +81,7 @@ def download_file(self, account_url: str, container_name: str, file_path: str):
         StorageBlobHelper(
             account_url=account_url, container_name=container_name
         ).download_file(
-            container_name=self.process_id, blob_name=self.name, file_path=file_path
+            container_name=self.process_id, blob_name=self.name, download_path=file_path
         )
 
     def upload_stream(self, account_url: str, container_name: str, stream: bytes):
diff --git a/src/ContentProcessor/src/libs/pipeline/entities/pipeline_message_base.py b/src/ContentProcessor/src/libs/pipeline/entities/pipeline_message_base.py
@@ -69,7 +69,7 @@ def add_exception(self, exception: BaseException):
         )
 
     @abstractmethod
-    def save_to_persistent_storage(self):
+    def save_to_persistent_storage(self, account_url: str, container_name: str):
         raise NotImplementedError("Method not implemented")
 
     class Config:
diff --git a/src/ContentProcessor/src/libs/pipeline/entities/pipeline_status.py b/src/ContentProcessor/src/libs/pipeline/entities/pipeline_status.py
@@ -90,7 +90,6 @@ def get_previous_step_result(self, current_step_name: str) -> Optional[StepResul
         return self.get_step_result(previous_step)
 
     def save_to_persistent_storage(self, account_url: str, container_name: str):
-        pass
         # raise NotImplementedError
         """
         Save the current PipelineStatus to persistent storage.
@@ -131,7 +130,6 @@ def _move_to_next_step(self, step_name: str):
             self.last_updated_time = datetime.datetime.now(
                 datetime.timezone.utc
             ).strftime("%Y-%m-%dT%H:%M:%S.%fZ")
-            pass
 
         self.completed_steps.append(step_name)
         # Remove current step from the remaining steps
diff --git a/src/ContentProcessor/src/libs/pipeline/queue_handler_base.py b/src/ContentProcessor/src/libs/pipeline/queue_handler_base.py
@@ -190,16 +190,6 @@ def _get_artifact_type(step_name: str) -> ArtifactType:
                         else:
                             return ArtifactType.Undefined
 
-                    def _find_process_result(step_name: str):
-                        return next(
-                            (
-                                result
-                                for result in self._current_message_context.data_pipeline.pipeline_status.process_results
-                                if result.step_name == step_name
-                            ),
-                            None,
-                        )
-
                     # Save the exception to the status object
                     if self._current_message_context is not None:
                         # Add Exception Information
diff --git a/src/ContentProcessor/src/libs/utils/remote_module_loader.py b/src/ContentProcessor/src/libs/utils/remote_module_loader.py
@@ -18,7 +18,6 @@ def load_schema_from_blob(
     blob_content = _download_blob_content(container_name, blob_name, account_url)
 
     # Execute the script content
-    module_name = module_name
     module = _execute_script(blob_content, module_name)
 
     loaded_class = getattr(module, module_name)
diff --git a/src/ContentProcessorAPI/app/dependencies.py b/src/ContentProcessorAPI/app/dependencies.py
@@ -9,12 +9,10 @@
 # Placeholder for the actual implementation
 async def get_token_header(x_token: Annotated[str, Header()]):
     """it should be registered in the app as a dependency"""
-    pass
     raise HTTPException(status_code=400, detail="X-Token header invalid")
 
 
 # Placeholder for the actual implementation
 async def get_query_token(token: str):
     """it should be registered in the app as a dependency"""
-    pass
     raise HTTPException(status_code=400, detail="No ... token provided")
diff --git a/src/ContentProcessorAPI/app/main.py b/src/ContentProcessorAPI/app/main.py
@@ -16,10 +16,6 @@
 app.include_router(schemavault.router)
 
 
-# class Hello(BaseModel):
-#     message: str
-
-
 @app.get("/health")
 async def ImAlive(response: Response):
     # Add Header Name is Custom-Header
diff --git a/src/ContentProcessorWeb/src/App.tsx b/src/ContentProcessorWeb/src/App.tsx
@@ -16,7 +16,7 @@ import {
 } from "react-router-dom";
 import Spinner from "./Components/Spinner/Spinner.tsx";
 
-import { useDispatch, useSelector, shallowEqual } from 'react-redux';
+import { useSelector, shallowEqual } from 'react-redux';
 import { RootState } from './store';
 
 
diff --git a/src/ContentProcessorWeb/src/Components/DocumentViewer/DocumentViewer.tsx b/src/ContentProcessorWeb/src/Components/DocumentViewer/DocumentViewer.tsx
@@ -22,9 +22,6 @@ const DocumentViewer = ({ className, metadata, urlWithSasToken, iframeKey }: IIF
         setImageError(false)
     }, [urlWithSasToken])
 
-    // Ref for the container div where the Dialog will be rendered
-    const containerRef = React.useRef<HTMLDivElement | null>(null);
-
     const getContentComponent = () => {
         if (!metadata || !urlWithSasToken) {
             return <div className={"noDataDocContainer"}><p>{t("components.document.none", "No document available")}</p></div>;
diff --git a/src/ContentProcessorWeb/src/Components/Header/Header.tsx b/src/ContentProcessorWeb/src/Components/Header/Header.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import { useNavigate, useLocation } from "react-router-dom";
-import { Header, useHeaderHooks } from "../../Hooks/useHeaderHooks.tsx";
+import { useHeaderHooks, Header } from "../../Hooks/useHeaderHooks.tsx";
 import {
   TabList,
   Tab,
@@ -9,24 +9,14 @@ import {
   MenuTrigger,
   MenuPopover,
   MenuList,
-  MenuGroup,
   MenuItem,
   MenuDivider,
   Avatar,
-  Button,
 } from "@fluentui/react-components";
-import {
-  Flow,
-  WeatherSunny,
-  WeatherMoon,
-  Person,
-  ArrowExit,
-  Share,
-  Cube,
-} from "../../Imports/bundleIcons.tsx";
+import { ArrowExit } from "../../Imports/bundleIcons.tsx";
 import MainLogo from "../../Imports/MainLogo.svg";
 import "./Header.css";
-import { DocumentBulletListCubeRegular, InfoRegular, DocumentData16Regular } from "@fluentui/react-icons"
+import { DocumentBulletListCubeRegular, InfoRegular } from "@fluentui/react-icons"
 
 import useAuth from "../../msal-auth/useAuth.ts";
 import { useSelector, shallowEqual } from 'react-redux';
@@ -54,8 +44,7 @@ const tabConfigs = [
 ];
 
 const HeaderPage: React.FC<HeaderPageProps> = ({ toggleTheme, isDarkMode }) => {
-  const { shortcutLabel } = useHeaderHooks({ toggleTheme, isDarkMode });
-  const { user, logout, getToken } = useAuth();
+  const { user, logout } = useAuth();
 
   const authEnabled = process.env.REACT_APP_AUTH_ENABLED?.toLowerCase() !== 'false'; // Defaults to true if not set
 
diff --git a/src/ContentProcessorWeb/src/Components/JSONEditor/JSONEditor.tsx b/src/ContentProcessorWeb/src/Components/JSONEditor/JSONEditor.tsx
@@ -4,7 +4,7 @@ import './JSONEditor.styles.scss'
 
 import { useDispatch, useSelector, shallowEqual } from 'react-redux';
 import { AppDispatch, RootState } from '../../store';
-import { fetchContentJsonData, setModifiedResult } from '../../store/slices/centerPanelSlice';
+import { setModifiedResult } from '../../store/slices/centerPanelSlice';
 
 import { SearchBox } from "@fluentui/react-components";
 
diff --git a/src/ContentProcessorWeb/src/Components/UploadContent/UploadFilesModal.tsx b/src/ContentProcessorWeb/src/Components/UploadContent/UploadFilesModal.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useRef, useEffect } from "react";
+import React, { useState, useRef } from "react";
 import {
   Dialog,
   DialogSurface,
@@ -7,9 +7,9 @@ import {
   DialogActions,
 } from "@fluentui/react-dialog";
 import { Button } from "@fluentui/react-button";
-import { Field, ProgressBar, makeStyles } from "@fluentui/react-components";
+import { ProgressBar, makeStyles } from "@fluentui/react-components";
 import { useDispatch, useSelector, shallowEqual } from "react-redux";
-import { fetchContentTableData, setRefreshGrid, uploadFile } from "../../store/slices/leftPanelSlice";
+import { setRefreshGrid, uploadFile } from "../../store/slices/leftPanelSlice";
 import { AppDispatch, RootState } from "../../store";
 import "./UploadFilesModal.styles.scss";
 
@@ -20,7 +20,6 @@ import {
   MessageBarTitle,
   MessageBarBody,
   MessageBarIntent,
-  Link,
 } from "@fluentui/react-components";
 
 const useStyles = makeStyles({
@@ -215,7 +214,7 @@ const UploadFilesModal: React.FC<UploadFilesModalProps> = ({ open, onClose }) =>
   const onCloseHandler = () => {
     resetState();
     onClose();
-  }
+  };
   return (
     <Dialog open={open} modalType="alert" >
       <DialogSurface>
diff --git a/src/ContentProcessorWeb/src/Hooks/usePanelHooks.tsx b/src/ContentProcessorWeb/src/Hooks/usePanelHooks.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import { Button, Body1Strong } from "@fluentui/react-components";
+import { Body1Strong } from "@fluentui/react-components";
 
 interface PanelToolbarProps {
   icon: React.ReactNode;
diff --git a/src/ContentProcessorWeb/src/Pages/DefaultPage/Components/ProcessQueueGrid/ProcessQueueGrid.tsx b/src/ContentProcessorWeb/src/Pages/DefaultPage/Components/ProcessQueueGrid/ProcessQueueGrid.tsx
diff --git a/src/ContentProcessorWeb/src/Pages/DefaultPage/Components/ProcessQueueGrid/ProcessQueueGridTypes.ts b/src/ContentProcessorWeb/src/Pages/DefaultPage/Components/ProcessQueueGrid/ProcessQueueGridTypes.ts
diff --git a/src/ContentProcessorWeb/src/Pages/DefaultPage/Components/ProcessSteps/ProcessSteps.tsx b/src/ContentProcessorWeb/src/Pages/DefaultPage/Components/ProcessSteps/ProcessSteps.tsx
diff --git a/src/ContentProcessorWeb/src/Pages/DefaultPage/Components/SchemaDropdown/SchemaDropdown.tsx b/src/ContentProcessorWeb/src/Pages/DefaultPage/Components/SchemaDropdown/SchemaDropdown.tsx

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ def download_file(self, account_url: str, container_name: str, file_path: str):`
`81`	`81`	`StorageBlobHelper(`
`82`	`82`	`account_url=account_url, container_name=container_name`
`83`	`83`	`).download_file(`
`84`		`- container_name=self.process_id, blob_name=self.name, file_path=file_path`
	`84`	`+ container_name=self.process_id, blob_name=self.name, download_path=file_path`
`85`	`85`	`)`
`86`	`86`
`87`	`87`	`def upload_stream(self, account_url: str, container_name: str, stream: bytes):`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ def add_exception(self, exception: BaseException):`
`69`	`69`	`)`
`70`	`70`
`71`	`71`	`@abstractmethod`
`72`		`- def save_to_persistent_storage(self):`
	`72`	`+ def save_to_persistent_storage(self, account_url: str, container_name: str):`
`73`	`73`	`raise NotImplementedError("Method not implemented")`
`74`	`74`
`75`	`75`	`class Config:`