Skip to content

chore: Dev merge to main#229

Merged
Prajwal-Microsoft merged 21 commits into
mainfrom
dev
May 11, 2026
Merged

chore: Dev merge to main#229
Prajwal-Microsoft merged 21 commits into
mainfrom
dev

Conversation

@Shreyas-Microsoft

Copy link
Copy Markdown
Contributor

Purpose

This pull request includes dependency updates, minor refactoring, and small bug fixes across both backend and frontend components. The most significant changes are dependency version bumps (notably for uuid and Python packages), adjustments to dependency injection patterns, and small improvements to code clarity and correctness.

Dependency Updates

  • Upgraded uuid package from version 11.x to 14.x in both package.json and package-lock.json for the frontend, with corresponding lockfile and binary path changes. [1] [2] [3] [4]
  • Updated Python backend dependencies: pinned python-dotenv and python-multipart to specific versions, and added requests, werkzeug, and pygments to the override list in pyproject.toml. [1] [2]

Backend Refactoring and Bug Fixes

  • Changed dependency injection for InMemoryDataService to register the class directly instead of a lambda factory, simplifying service registration and its corresponding unit test. [1] [2]
  • Fixed method signatures and implementations in SKLogicBase.py: added missing self parameter to execute, replaced ... with pass in overloaded methods. [1] [2] [3]
  • Clarified error handling in validate_bicep_params.py by adding a comment explaining the fallback behavior when JSON parsing fails.
  • Added method body (with pass) for include_router in the FastAPIWithContext protocol for improved type checking and clarity.

Frontend Improvements and Bug Fixes

  • Improved error grouping in renderErrorContent by filtering files with error_count > 0 instead of a truthy check, ensuring only files with actual errors are shown.
  • Adjusted progress calculation in ProgressModal to always return 100% if processingCompleted, regardless of errors.
  • Minor code style and correctness fixes, such as adding missing semicolons and removing unused variables in React components. [1] [2] [3]

Other Dependency and Lockfile Cleanups

These changes collectively improve dependency management, code clarity, and correctness across the project.

Does this introduce a breaking change?

  • Yes
  • No

Golden Path Validation

  • I have tested the primary workflows (the "golden path") to ensure they function correctly without errors.

Deployment Validation

  • I have validated the deployment process successfully and all services are running as expected with this change.

What to Check

Verify that the following are valid

  • ...

Other Information

@github-actions

github-actions Bot commented May 8, 2026

Copy link
Copy Markdown

Coverage

Coverage Report •
FileStmtsMissCoverMissing
application.py34340%1–2, 4–11, 16–17, 20–21, 24, 30–31, 33–34, 36, 44, 50, 52, 60–62, 65, 74, 81–82, 84, 91, 139–140
libs/base
   SKLogicBase.py46460%1–2, 4–5, 14–15, 18, 21–24, 28, 35–36, 38–40, 42–43, 56–57, 59–60, 64–65, 69, 71, 76, 78, 82, 84–85, 87–88, 95, 97–98, 105, 107–108, 114, 116–120
   fastapi_protocol.py10100%4, 6–7, 10, 16, 19–20, 23, 36–37
TOTAL274024789% 

Tests Skipped Failures Errors Time
44 0 💤 0 ❌ 0 🔥 11.573s ⏱️

Comment thread src/processor/src/services/queue_service.py Fixed

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR merges development changes into main, combining dependency updates and small refactors/bug fixes across the processor, backend API, and frontend.

Changes:

  • Updated Python (uv/pyproject/lockfiles) and Node dependencies (notably uuid, plus new processor npm deps).
  • Replaced several silent except: pass blocks with debug logging and minor flow/clarity adjustments.
  • Refactored a few integration points (backend DI registration, typing/protocol stubs, frontend UI logic cleanups).

Reviewed changes

Copilot reviewed 33 out of 37 changed files in this pull request and generated 2 comments.

Show a summary per file
File Description
src/processor/uv.lock Updates locked Python dependencies (e.g., aiohttp, fastmcp, pytest) and related metadata.
src/processor/src/utils/agent_telemetry.py Removes dead commented code; adds debug logs for previously swallowed exceptions; ensures None return when repository absent.
src/processor/src/tests/conftest.py Clarifies intentional side-effect import of sitecustomize.
src/processor/src/steps/migration_processor.py Adds debug logs where exceptions were swallowed; explicitly returns None at end of workflow run.
src/processor/src/services/queue_service.py Replaces silent exception swallowing with debug logs; minor cleanup comment for GC.
src/processor/src/services/control_api.py Adds debug logs for best-effort shutdown failures.
src/processor/src/libs/reporting/migration_report_generator.py Adds debug logging when file size cannot be determined.
src/processor/src/libs/mcp_server/mermaid/mcp_mermaid.py Adds explanatory comment for non-JSON CLI output handling.
src/processor/src/libs/mcp_server/datetime/mcp_datetime.py Removes unreachable return statements in error paths.
src/processor/src/libs/agent_framework/qdrant_memory_store.py Adds debug logging for best-effort cleanup failures.
src/processor/src/libs/agent_framework/azure_openai_response_retry.py Adds debug logging for best-effort stream close failures.
src/processor/src/libs/agent_framework/agent_framework_helper.py Replaces overload stub bodies with pass.
src/processor/pyproject.toml Bumps processor Python dependency pins (aiohttp, fastmcp, pytest).
src/processor/package.json Adds processor npm deps (dompurify, lodash-es) alongside mermaid.
src/processor/package-lock.json Lockfile updates for added/bumped processor npm deps.
src/frontend/vite.config.js Removes unused path import.
src/frontend/src/pages/processPage.tsx Removes unused imports/state related to lastUpdateTime and config helpers.
src/frontend/src/pages/modernizationPage.tsx Removes unused state/logic; adjusts summary rendering and file selection handling.
src/frontend/src/pages/landingPage.tsx Removes unused imports/handlers; simplifies start-translating flow.
src/frontend/src/pages/batchView.tsx Removes unused UI code; adjusts summary rendering condition.
src/frontend/src/msal-auth/apiHeaders.ts Removes unused getMsalInstance import; keeps header utilities and debugging helper.
src/frontend/src/main.jsx Adjusts config initialization variable to avoid misleading default assignment.
src/frontend/src/components/uploadButton.tsx Removes unused imports/state and dead handler.
src/frontend/src/components/bottomBar.tsx Removes unused useState import.
src/frontend/src/components/batchHistoryPanel.tsx Minor cleanup (formatting and dead commented categorization logic).
src/frontend/src/commonComponents/ProgressModal/progressModal.tsx Ensures progress shows 100% when processingCompleted, regardless of error.
src/frontend/src/api/utils.tsx Fixes error grouping to include only files with error_count > 0.
src/frontend/package.json Bumps uuid to ^14; adds uuid override alignment entry.
src/frontend/package-lock.json Lockfile updates for uuid@14 and lockfile cleanup (e.g., libc removals).
src/frontend/frontend_server.py Removes unused HTMLResponse import and unused referer header variable.
src/backend-api/uv.lock Updates backend API lock overrides and package versions (dotenv, multipart, requests, werkzeug, pygments).
src/backend-api/src/tests/application/test_dependency_injection.py Updates DI test to register InMemoryDataService directly.
src/backend-api/src/app/libs/base/SKLogicBase.py Fixes missing self param; changes overload stubs to pass.
src/backend-api/src/app/libs/base/fastapi_protocol.py Adds method body for protocol include_router to aid type checking.
src/backend-api/src/app/application.py Registers InMemoryDataService directly instead of lambda factory.
src/backend-api/pyproject.toml Pins backend dependencies (dotenv/multipart) and expands override list (requests/werkzeug/pygments).
scripts/validate_bicep_params.py Adds clarifying comment for fallback parsing behavior.
Files not reviewed (2)
  • src/frontend/package-lock.json: Language not supported
  • src/processor/package-lock.json: Language not supported
Comments suppressed due to low confidence (1)

src/frontend/src/pages/batchView.tsx:573

  • The summary rendering branch no longer checks batchSummary for null, but the code inside immediately dereferences it (e.g., batchSummary.error_count). Since batchSummary is initialized as null, selecting the Summary file before the fetch completes can throw at render time. Restore the null-guard (e.g., selectedFile.id === "summary" && batchSummary) or use optional chaining/defaults inside this block.
    // Show the summary page when summary is selected
    if (selectedFile.id === "summary") {
      // Check if there are no errors and all JSON/YAML files are processed successfully
      const noErrors = (batchSummary.error_count === 0);
      const jsonYamlFileCount = getJsonYamlFileCount();
      const allJsonYamlFilesProcessed = (jsonYamlFileCount >= 0); // All existing JSON/YAML files are considered processed

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread src/frontend/src/pages/modernizationPage.tsx
Comment thread src/backend-api/src/app/libs/base/SKLogicBase.py
chore: Bicep Parameter validation email format change
Shreyas-Microsoft and others added 2 commits May 8, 2026 11:18
Brings the following hotfix/doc commits from main back into dev:
  3552f12 Merge PR #221 (psl-addBicepVer)
  7474d9f docs: add Bicep CLI prerequisite to local deployment guide
  f0e9975 Merge PR #206 (hotfix/disable-buildx-provenance-acr-standard)
  76fb954 fix(ci): disable buildx provenance to fix ACR Standard push (400)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 34 out of 38 changed files in this pull request and generated 2 comments.

Files not reviewed (2)
  • src/frontend/package-lock.json: Language not supported
  • src/processor/package-lock.json: Language not supported

Comment thread src/processor/src/tests/conftest.py
Comment thread src/frontend/src/pages/batchView.tsx
@Prajwal-Microsoft Prajwal-Microsoft merged commit 70bdb85 into main May 11, 2026
21 checks passed
@github-actions

Copy link
Copy Markdown

🎉 This PR is included in version 2.0.3 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants