Skip to content

chore: Dev merge to Main#273

Merged
Roopan-Microsoft merged 39 commits into
mainfrom
dev
Jun 10, 2026
Merged

chore: Dev merge to Main#273
Roopan-Microsoft merged 39 commits into
mainfrom
dev

Conversation

@Prachig-Microsoft

@Prachig-Microsoft Prachig-Microsoft commented Jun 4, 2026

Copy link
Copy Markdown
Contributor

Purpose

This pull request includes several updates across the codebase, focusing on improving naming consistency for Docker build steps, updating and adding dependencies, and making minor code and test improvements. The most significant changes are grouped below:

Docker Build & Naming Consistency:

  • Updated the names of Docker build steps in .github/workflows/docker-build-and-push.yml to use more generic and consistent names: "Backend API", "Processor", and "Frontend" instead of the previous "ContentProcessorAPI", "ContentProcessor", and "ContentProcessorWeb". This improves clarity and maintainability in CI workflows. [1] [2] [3]

Dependency Updates:

  • Upgraded werkzeug from version 3.1.4 to 3.1.6 and added idna==3.15 to the override-dependencies in src/backend-api/pyproject.toml to address potential security or compatibility issues.
  • Added idna==3.15 to the override-dependencies in src/processor/pyproject.toml for consistency and dependency management.

Testing and Code Quality Improvements:

  • Simplified test service registration in test_application_context_extras.py by passing class references directly instead of lambda factories, making the tests more concise and idiomatic. [1] [2]
  • Improved clarity in test exception handling comments in test_queue_service_internals.py.
  • Removed an unused import in test_sk_logic_base.py and cleaned up React Redux imports in batchHistoryPanel.tsx for minor code hygiene. [1] [2]

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

Dhanushree-Microsoft and others added 22 commits May 21, 2026 11:44
fix: update werkzeug to 3.1.6 and add idna 3.15 to dependencies
When callers pass credential=None explicitly, the key exists in kwargs
but the ad_token_provider mapping was skipped. Use kwargs.get() is None
to correctly handle this case.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
When callers pass credential=None explicitly, the key exists in kwargs
but the ad_token_provider mapping was skipped. Use kwargs.get() is None
to correctly handle this case.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Keep agent-framework==1.3.0 upgrade from PR (per user story 43673).
Accept newer general dependency versions from dev branch.
Keep upgraded azure_openai_response_retry.py from PR.

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

- Fix create_agents return type annotation to dict[str, Agent]
- Narrow participants param to Mapping only (Sequence was unused)
- Normalize self.agents with dict() and correct value type
- Replace redundant pass with continue and clarifying comment
- Add teardown_module to test files to restore patched Message class

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
- Update InputObserverMiddleware to use Message(contents=) instead of
  Message(text=) since agent-framework 1.3.0 renamed the parameter
- Update corresponding tests to verify contents field
- Fix teardown_module signature to accept optional module parameter

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
The teardown_module from one test file was restoring the real Message
before another test file's tests ran. Adding setup_module ensures the
stub is re-applied before each module's tests execute.

Also fix test assertion to check contents instead of text since the
middleware now uses Message(contents=).

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
The middleware now uses Message(contents=) so the test must verify
the contents field, not text.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
- Set both text= and contents= when constructing Message in
  InputObserverMiddleware for compatibility with downstream code
- Restore missing copyright header in azure_openai_response_retry.py

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
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 36 changed files in this pull request and generated 4 comments.

Comments suppressed due to low confidence (1)

src/processor/src/libs/agent_framework/shared_memory_context_provider.py:311

  • SharedMemoryContextProvider._get_text() doesn’t consider the contents attribute, but agent-framework 1.3.0 Messages often carry the actual text in contents (and your updated middleware/tests reflect that). This can cause memory retrieval queries to become empty/low-signal when .text is unset, reducing recall quality.
        if hasattr(message, "text") and message.text:
            return message.text
        if hasattr(message, "content"):
            return str(message.content) if message.content else ""
        return str(message) if message else ""

Comment thread src/processor/src/libs/agent_framework/middlewares.py
Comment thread src/processor/src/libs/agent_framework/azure_openai_response_retry.py Outdated
Comment thread src/processor/src/libs/agent_framework/azure_openai_response_retry.py Outdated
Comment thread src/processor/src/libs/agent_framework/azure_openai_response_retry.py Outdated
…nd-remove-unused-import

Revert "fix: remove unused WorkflowEvent import and restore 'invalid content' retry check"
Revert "fix: Refactor code structure for improved readability and maintainability"

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 7 out of 9 changed files in this pull request and generated 1 comment.

Comment thread src/processor/pyproject.toml

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 7 out of 9 changed files in this pull request and generated 2 comments.

@Roopan-Microsoft Roopan-Microsoft merged commit 868bd5d into main Jun 10, 2026
26 of 27 checks passed
@github-actions

Copy link
Copy Markdown

🎉 This PR is included in version 2.1.1 🎉

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